From 6189051361a16f28279ab7d2c8c8ebab71a41a17 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 9 Jun 2006 10:12:16 +0000 Subject: [PATCH] gst/: Update for API additions. Original commit message from CVS: * gst/base.defs: * gst/gst-0.10.7.ignore: * gst/gst-types.defs: * gst/gst.defs: * gst/gstbase.override: * gst/libs.defs: Update for API additions. * gst/gstmodule.c: (init_gst): Added new GST_TAG_IMAGE and GST_TAG_PREVIEW_IMAGE --- ChangeLog | 12 ++++++++++++ common | 2 +- gst/base.defs | 9 +++++++++ gst/gst-0.10.7.ignore | 7 +++++++ gst/gst-types.defs | 2 ++ gst/gst.defs | 11 +++++++++++ gst/gstbase.override | 2 +- gst/gstmodule.c | 7 +++++++ gst/libs.defs | 33 +++++++++++++++++++++++++++++++++ 9 files changed, 83 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 665c683..7fce9d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-06-09 Edward Hervey + + * gst/base.defs: + * gst/gst-0.10.7.ignore: + * gst/gst-types.defs: + * gst/gst.defs: + * gst/gstbase.override: + * gst/libs.defs: + Update for API additions. + * gst/gstmodule.c: (init_gst): + Added new GST_TAG_IMAGE and GST_TAG_PREVIEW_IMAGE + 2006-05-27 Yuri Pankov reviewed by: Edward Hervey diff --git a/common b/common index 764c5f2..5d58e76 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 764c5f25101d20da7f26942c36ba840ba65c63d7 +Subproject commit 5d58e7652bf38a637dceca167d6e47e7794b2b52 diff --git a/gst/base.defs b/gst/base.defs index c4d97a6..ba150ad 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -628,6 +628,15 @@ (return-type "none") ) +(define-method set_flushing + (of-object "GstCollectPads") + (c-name "gst_collect_pads_set_flushing") + (return-type "none") + (parameters + '("gboolean" "flushing") + ) +) + (define-method peek (of-object "GstCollectPads") (c-name "gst_collect_pads_peek") diff --git a/gst/gst-0.10.7.ignore b/gst/gst-0.10.7.ignore index 496f177..d590af4 100644 --- a/gst/gst-0.10.7.ignore +++ b/gst/gst-0.10.7.ignore @@ -1,7 +1,14 @@ %% ignore gst_type_find_new + gst_element_seek_simple + GST_FLOW_CUSTOM_SUCCESS + GST_FLOW_CUSTOM_ERROR + gst_collect_pads_set_flushing + gst_dp_crc %% ignore-type GstTypeFind + GstDPVersion + GstDPPacketizer %% diff --git a/gst/gst-types.defs b/gst/gst-types.defs index 6f45690..1ac8994 100644 --- a/gst/gst-types.defs +++ b/gst/gst-types.defs @@ -777,6 +777,7 @@ (c-name "GstFlowReturn") (gtype-id "GST_TYPE_FLOW_RETURN") (values + '("custom-success" "GST_FLOW_CUSTOM_SUCCESS") '("resend" "GST_FLOW_RESEND") '("ok" "GST_FLOW_OK") '("not-linked" "GST_FLOW_NOT_LINKED") @@ -785,6 +786,7 @@ '("not-negotiated" "GST_FLOW_NOT_NEGOTIATED") '("error" "GST_FLOW_ERROR") '("not-supported" "GST_FLOW_NOT_SUPPORTED") + '("custom-error" "GST_FLOW_CUSTOM_ERROR") ) ) diff --git a/gst/gst.defs b/gst/gst.defs index d7fbac3..a29dec1 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -6510,6 +6510,17 @@ ) ) +(define-method seek_simple + (of-object "GstElement") + (c-name "gst_element_seek_simple") + (return-type "gboolean") + (parameters + '("GstFormat" "format") + '("GstSeekFlags" "seek_flags") + '("gint64" "seek_pos") + ) +) + (define-method can_src_caps (of-object "GstElementFactory") (c-name "gst_element_factory_can_src_caps") diff --git a/gst/gstbase.override b/gst/gstbase.override index ff5d079..5e5e16b 100644 --- a/gst/gstbase.override +++ b/gst/gstbase.override @@ -404,7 +404,7 @@ _wrap_GstPushSrc__proxy_do_create (GstPushSrc * self, */ if ((PyTuple_Check(py_ret)) && (PyTuple_Size (py_ret) == 2)) { - PyArg_ParseTuple (py_ret, "O!O!", &py_flow, + PyArg_ParseTuple (py_ret, "O!O!", &PyGEnum_Type, &py_flow, &PyGstBuffer_Type, &py_buffer); *buffer = GST_BUFFER (((PyGstMiniObject*) self)->obj); gst_buffer_ref (*buffer); diff --git a/gst/gstmodule.c b/gst/gstmodule.c index adc7f98..3c03aeb 100644 --- a/gst/gstmodule.c +++ b/gst/gstmodule.c @@ -235,6 +235,13 @@ init_gst (void) PyModule_AddStringConstant (m, "TAG_ALBUM_GAIN", GST_TAG_ALBUM_GAIN); PyModule_AddStringConstant (m, "TAG_ALBUM_PEAK", GST_TAG_ALBUM_PEAK); PyModule_AddStringConstant (m, "TAG_LANGUAGE_CODE", GST_TAG_LANGUAGE_CODE); +#if (GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR == 10 && \ + ((GST_VERSION_MICRO >= 6) || (GST_VERSION_MICRO == 5 && GST_VERSION_NANO > 0))) + 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); +#endif +#endif PyModule_AddStringConstant (m, "LIBRARY_ERROR", (gchar *) g_quark_to_string(GST_LIBRARY_ERROR)); PyModule_AddStringConstant (m, "RESOURCE_ERROR",(gchar *) g_quark_to_string(GST_RESOURCE_ERROR)); diff --git a/gst/libs.defs b/gst/libs.defs index 072aaf1..d4e00a5 100644 --- a/gst/libs.defs +++ b/gst/libs.defs @@ -23,6 +23,16 @@ ) ) +(define-enum DPVersion + (in-module "Gst") + (c-name "GstDPVersion") + (gtype-id "GST_TYPE_DP_VERSION") + (values + '("0-2" "GST_DP_VERSION_0_2") + '("1-0" "GST_DP_VERSION_1_0") + ) +) + (define-flags DPHeaderFlag (in-module "Gst") (c-name "GstDPHeaderFlag") @@ -138,6 +148,15 @@ ) ) +(define-method unset_all + (of-object "GstController") + (c-name "gst_controller_unset_all") + (return-type "gboolean") + (parameters + '("gchar*" "property_name") + ) +) + (define-method get (of-object "GstController") (c-name "gst_controller_get") @@ -272,6 +291,20 @@ ;; From ../gstreamer/libs/gst/dataprotocol/dataprotocol.h +(define-function dp_init + (c-name "gst_dp_init") + (return-type "none") +) + +(define-function dp_crc + (c-name "gst_dp_crc") + (return-type "guint16") + (parameters + '("const-guint8*" "buffer") + '("guint" "length") + ) +) + (define-function dp_header_payload_length (c-name "gst_dp_header_payload_length") (return-type "guint32") -- 2.7.4