From: Edward Hervey Date: Fri, 20 Oct 2006 10:41:46 +0000 (+0000) Subject: Added ignore files for 0.10.11 gstreamer core X-Git-Tag: 1.19.3~485^2~746 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad1f511e6b5167aa043b6b3af8f221819e4199bd;p=platform%2Fupstream%2Fgstreamer.git Added ignore files for 0.10.11 gstreamer core Original commit message from CVS: * configure.ac: * gst/Makefile.am: * gst/gst-0.10.11.ignore: * gst/gstversion.override.in: Added ignore files for 0.10.11 gstreamer core * gst/base.defs: Updated API for base libs * gst/gst.defs: Updated API for core * gst/gst.override: remove #ifdef for methods which weren't available in versions of pygtk we don't support anymore. * gst/gstbase.override: Added overrides for GstBaseSink::get_times() virtual method * gst/gstbin.override: Added override for GstBin::handle_message() virtual method --- diff --git a/ChangeLog b/ChangeLog index cf19605..b8fbc6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ 2006-10-20 Edward Hervey + * configure.ac: + * gst/Makefile.am: + * gst/gst-0.10.11.ignore: + * gst/gstversion.override.in: + Added ignore files for 0.10.11 gstreamer core + * gst/base.defs: + Updated API for base libs + * gst/gst.defs: + Updated API for core + * gst/gst.override: + remove #ifdef for methods which weren't available in versions of pygtk + we don't support anymore. + * gst/gstbase.override: + Added overrides for GstBaseSink::get_times() virtual method + * gst/gstbin.override: + Added override for GstBin::handle_message() virtual method + +2006-10-20 Edward Hervey + * examples/Makefile.am: Remove gst123 and vorbisplay.py from sources, and add decodebin.py diff --git a/configure.ac b/configure.ac index afd2669..d1d11c9 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,13 @@ then IGNORE_GST_0_10_10="" fi + if test $GST_MINOR_VERSION -lt "11" + then + IGNORE_GST_0_10_11="gst-0.10.11.ignore" + else + IGNORE_GST_0_10_11="" + fi + else IGNORE_GST_0_10_3="" IGNORE_GST_0_10_4="" @@ -141,6 +148,7 @@ else IGNORE_GST_0_10_6="" IGNORE_GST_0_10_7="" IGNORE_GST_0_10_10="" + IGNORE_GST_0_10_11="" fi AC_SUBST(IGNORE_GST_0_10_3) AC_SUBST(IGNORE_GST_0_10_4) @@ -148,6 +156,7 @@ AC_SUBST(IGNORE_GST_0_10_5) AC_SUBST(IGNORE_GST_0_10_6) AC_SUBST(IGNORE_GST_0_10_7) AC_SUBST(IGNORE_GST_0_10_10) +AC_SUBST(IGNORE_GST_0_10_11) dnl check for gstreamer-base; uninstalled is selected preferentially PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ, diff --git a/gst/Makefile.am b/gst/Makefile.am index 715ff54..087faa0 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -28,7 +28,8 @@ versioned_overrides = \ gst-0.10.5.ignore \ gst-0.10.6.ignore \ gst-0.10.7.ignore \ - gst-0.10.10.ignore + gst-0.10.10.ignore \ + gst-0.10.11.ignore INCLUDES = $(PYTHON_INCLUDES) EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py diff --git a/gst/base.defs b/gst/base.defs index ba150ad..bf0c9d9 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -140,6 +140,11 @@ (return-type "GType") ) +(define-method wait_preroll + (of-object "GstBaseSink") + (c-name "gst_base_sink_wait_preroll") + (return-type "GstFlowReturn") +) (define-method set_sync (of-object "GstBaseSink") @@ -266,6 +271,12 @@ (return-type "GType") ) +(define-method wait_playing + (of-object "GstBaseSrc") + (c-name "gst_base_src_wait_playing") + (return-type "GstFlowReturn") +) + (define-method set_live (of-object "GstBaseSrc") (c-name "gst_base_src_set_live") @@ -556,7 +567,7 @@ (return-type "GType") ) -(define-function gst_collect_pads_new +(define-function collect_pads_new (c-name "gst_collect_pads_new") (is-constructor-of "GstCollectPads") (return-type "GstCollectPads*") diff --git a/gst/gst-0.10.11.ignore b/gst/gst-0.10.11.ignore new file mode 100644 index 0000000..b431297 --- /dev/null +++ b/gst/gst-0.10.11.ignore @@ -0,0 +1,8 @@ +%% +ignore + gst_message_parse_buffering + gst_message_new_buffering + gst_base_sink_wait_preroll + gst_base_src_wait_playing + gst_tag_list_is_empty +%% diff --git a/gst/gst.defs b/gst/gst.defs index 5c4ebde..6ba15fb 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -1967,8 +1967,8 @@ '("gdouble" "rate") '("GstFormat" "format") '("GstSeekFlags" "flags") - '("GstSeekType" "cur_type") - '("gint64" "cur") + '("GstSeekType" "start_type") + '("gint64" "start") '("GstSeekType" "stop_type") '("gint64" "stop") ) @@ -1982,8 +1982,8 @@ '("gdouble*" "rate") '("GstFormat*" "format") '("GstSeekFlags*" "flags") - '("GstSeekType*" "cur_type") - '("gint64*" "cur") + '("GstSeekType*" "start_type") + '("gint64*" "start") '("GstSeekType*" "stop_type") '("gint64*" "stop") ) @@ -2833,6 +2833,15 @@ ) ) +(define-function gst_message_new_buffering + (c-name "gst_message_new_buffering") + (return-type "GstMessage*") + (parameters + '("GstObject*" "src") + '("gint" "percent") + ) +) + (define-function message_new_state_changed (c-name "gst_message_new_state_changed") (return-type "GstMessage*") @@ -2978,6 +2987,15 @@ ) ) +(define-method parse_buffering + (of-object "GstMessage") + (c-name "gst_message_parse_buffering") + (return-type "none") + (parameters + '("gint*" "percent") + ) +) + (define-method parse_state_changed (of-object "GstMessage") (c-name "gst_message_parse_state_changed") @@ -3278,9 +3296,9 @@ (define-method save_thyself (of-object "GstObject") (c-name "gst_object_save_thyself") - (return-type "xmlNodePtr") + (return-type "GstXmlNodePtr") (parameters - '("xmlNodePtr" "parent") + '("GstXmlNodePtr" "parent") ) ) @@ -3289,7 +3307,7 @@ (c-name "gst_object_restore_thyself") (return-type "none") (parameters - '("xmlNodePtr" "self") + '("GstXmlNodePtr" "self") ) ) @@ -3310,15 +3328,15 @@ (parameters '("GstObject*" "object") '("const-gchar*" "name") - '("xmlNodePtr" "self") + '("GstXmlNodePtr" "self") ) ) (define-virtual save_thyself (of-object "GstObject") - (return-type "xmlNodePtr") + (return-type "GstXmlNodePtr") (parameters - '("xmlNodePtr" "parent") + '("GstXmlNodePtr" "parent") ) ) @@ -3326,7 +3344,7 @@ (of-object "GstObject") (return-type "none") (parameters - '("xmlNodePtr" "self") + '("GstXmlNodePtr" "self") ) ) @@ -3983,7 +4001,7 @@ (c-name "gst_pad_load_and_link") (return-type "none") (parameters - '("xmlNodePtr" "self") + '("GstXmlNodePtr" "self") '("GstObject*" "parent") ) ) @@ -4865,8 +4883,8 @@ '("gdouble" "rate") '("GstFormat" "format") '("GstSeekFlags" "flags") - '("GstSeekType" "cur_type") - '("gint64" "cur") + '("GstSeekType" "start_type") + '("gint64" "start") '("GstSeekType" "stop_type") '("gint64" "stop") '("gboolean*" "update") @@ -5471,6 +5489,12 @@ (caller-owns-return #t) ) +(define-method is_empty + (of-object "GstTagList") + (c-name "gst_tag_list_is_empty") + (return-type "gboolean") +) + (define-method insert (of-object "GstTagList") (c-name "gst_tag_list_insert") diff --git a/gst/gst.override b/gst/gst.override index f241eff..ad282af 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -117,7 +117,6 @@ _pygst_element_check_error (GstElement *element) return TRUE; } -#ifdef pyg_register_class_init PyTypeObject PyGstPadTemplate_Type; static int add_templates (gpointer gclass, PyObject *templates) @@ -198,7 +197,6 @@ _pygst_element_init (gpointer gclass, PyTypeObject *pyclass) return 0; } -#endif static PyObject * pygst_debug_log (PyObject *pyobject, PyObject *string, GstDebugLevel level, @@ -253,10 +251,7 @@ include %% init { -/* FIXME: new in pygtk-2.6 */ -#ifdef pyg_register_class_init pyg_register_class_init (GST_TYPE_ELEMENT, _pygst_element_init); -#endif if (!pygst_value_init()) return; gst_controller_init(NULL, NULL); diff --git a/gst/gstbase.override b/gst/gstbase.override index 5e5e16b..a00ca45 100644 --- a/gst/gstbase.override +++ b/gst/gstbase.override @@ -550,3 +550,98 @@ _wrap_GstBaseTransform__do_get_unit_size (PyObject *cls, PyObject *args, PyObjec return py_ret; } +%% +override GstBaseSink__proxy_do_get_times +static void +_wrap_GstBaseSink__proxy_do_get_times (GstBaseSink * self, + GstBuffer *buffer, + GstClockTime * start, + GstClockTime * end) +{ + PyGILState_STATE __py_state; + PyObject *py_args; + PyObject *py_self; + PyObject *py_method; + PyObject *py_ret; + + __py_state = pyg_gil_state_ensure(); + + py_self = pygobject_new((GObject *) self); + if (!py_self) { + if (PyErr_Occurred()) + PyErr_Print(); + return; + } + + py_args = Py_BuildValue ("(N)", + pygstminiobject_new((GstMiniObject *)buffer)); + + py_method = PyObject_GetAttrString(py_self, "do_get_times"); + + Py_DECREF(py_self); + + if (!py_method) { + if (PyErr_Occurred()) + PyErr_Print(); + goto beach; + } + + py_ret = PyObject_CallObject(py_method, py_args); + + Py_DECREF(py_method); + + if (!py_ret) { + if (PyErr_Occurred()) + PyErr_Print(); + goto beach; + } + + /* + If the method returned a numeric, the return value will be TRUE. + For ANY other case, we don't set size and the return value is FALSE. + */ + + if ((PyTuple_Check(py_ret)) && (PyTuple_Size (py_ret) == 2)) + PyArg_ParseTuple (py_ret, "KK", start, end); + + Py_DECREF (py_ret); + beach: + Py_DECREF (py_args); + pyg_gil_state_release(__py_state); + return; +} +%% +override GstBaseSink__do_get_times kwargs +static PyObject * +_wrap_GstBaseSink__do_get_times (PyObject *cls, PyObject *args, PyObject *kwargs) +{ + gpointer klass; + static char *kwlist[] = { "self", "buffer", NULL }; + PyGObject *self; + PyGstMiniObject *py_buffer; + GstClockTime start = 0; + GstClockTime end = 0; + PyObject *py_ret; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!:GstBaseSink.get_times", + kwlist, &PyGstBaseSink_Type, &self, + &PyGstBuffer_Type, &py_buffer)) + return NULL; + klass = g_type_class_ref(pyg_type_from_object(cls)); + if (GST_BASE_SINK_CLASS(klass)->get_times) + GST_BASE_SINK_CLASS(klass)->get_times(GST_BASE_SINK(self->obj), + GST_BUFFER(py_buffer->obj), + &start, &end); + else { + PyErr_SetString(PyExc_NotImplementedError, "virtual method GstBaseSink.get_times not implemented"); + g_type_class_unref(klass); + return NULL; + } + g_type_class_unref(klass); + + py_ret = PyTuple_New(2); + PyTuple_SetItem(py_ret, 0, PyLong_FromUnsignedLongLong(start)); + PyTuple_SetItem(py_ret, 1, PyLong_FromUnsignedLongLong(end)); + + return py_ret; +} diff --git a/gst/gstbin.override b/gst/gstbin.override index 65158cc..071158f 100644 --- a/gst/gstbin.override +++ b/gst/gstbin.override @@ -147,3 +147,28 @@ _wrap_gst_bin_tp_iter(PyGObject *self) { return _wrap_gst_bin_iterate_elements(self); } +%% +override GstBin__do_handle_message kwargs +static PyObject * +_wrap_GstBin__do_handle_message(PyObject *cls, PyObject *args, PyObject *kwargs) +{ + gpointer klass; + static char *kwlist[] = { "self", "message", NULL }; + PyGObject *self; + PyGstMiniObject *message; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!O!:GstBin.handle_message", kwlist, &PyGstBin_Type, &self, &PyGstMessage_Type, &message)) + return NULL; + klass = g_type_class_ref(pyg_type_from_object(cls)); + if (GST_BIN_CLASS(klass)->handle_message) { + gst_mini_object_ref (message->obj); + GST_BIN_CLASS(klass)->handle_message(GST_BIN(self->obj), GST_MESSAGE(message->obj)); + } else { + PyErr_SetString(PyExc_NotImplementedError, "virtual method GstBin.handle_message not implemented"); + g_type_class_unref(klass); + return NULL; + } + g_type_class_unref(klass); + Py_INCREF(Py_None); + return Py_None; +} diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index e102fb6..c71dd901 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -6,4 +6,5 @@ include @IGNORE_GST_0_10_6@ @IGNORE_GST_0_10_7@ @IGNORE_GST_0_10_10@ +@IGNORE_GST_0_10_11@ %%