From ef1189b506ae18d9a593b50be343e813d662fc85 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 9 Oct 2007 16:17:28 +0000 Subject: [PATCH] gst/: Update API definitions for GStreamer core and gst-plugins-base. Original commit message from CVS: * gst/base.defs: * gst/libs.defs: * gst/gst.defs: * gst/gst.override: Update API definitions for GStreamer core and gst-plugins-base. * configure.ac: * gst/Makefile.am: * gst/gst-0.10.15.ignore: * gst/gst-pb-0.10.15.ignore: * gst/gstversion.override.in: New .ignore for 0.10.14.* API --- ChangeLog | 14 ++++++++++++ configure.ac | 18 +++++++++++++++ gst/Makefile.am | 2 ++ gst/base.defs | 45 ++++++++++++++++++++++++++++++++++++++ gst/gst-0.10.15.ignore | 6 +++++ gst/gst-pb-0.10.15.ignore | 13 +++++++++++ gst/gst.defs | 36 ++++++++++++++++++++++++++---- gst/gst.override | 1 + gst/gstversion.override.in | 2 ++ gst/libs.defs | 45 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 gst/gst-0.10.15.ignore create mode 100644 gst/gst-pb-0.10.15.ignore diff --git a/ChangeLog b/ChangeLog index 9922461825..e1db7537ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-10-09 Edward Hervey + + * gst/base.defs: + * gst/libs.defs: + * gst/gst.defs: + * gst/gst.override: + Update API definitions for GStreamer core and gst-plugins-base. + * configure.ac: + * gst/Makefile.am: + * gst/gst-0.10.15.ignore: + * gst/gst-pb-0.10.15.ignore: + * gst/gstversion.override.in: + New .ignore for 0.10.14.* API + 2007-10-09 Edward Hervey * testsuite/common.py: diff --git a/configure.ac b/configure.ac index 156ce4e302..9f053574f6 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,13 @@ then IGNORE_GST_0_10_14="" fi + if test $GST_MINOR_VERSION -lt "15" + then + IGNORE_GST_0_10_15="gst-0.10.15.ignore" + else + IGNORE_GST_0_10_15="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "11" then @@ -181,6 +188,13 @@ then IGNORE_GST_PB_0_10_14="" fi + if test $GST_PB_MINOR_VERSION -lt "15" + then + IGNORE_GST_PB_0_10_15="gst-pb-0.10.15.ignore" + else + IGNORE_GST_PB_0_10_15="" + fi + else IGNORE_GST_0_10_3="" @@ -193,8 +207,10 @@ else IGNORE_GST_0_10_12="" IGNORE_GST_0_10_13="" IGNORE_GST_0_10_14="" + IGNORE_GST_0_10_15="" IGNORE_GST_PB_0_10_11="" IGNORE_GST_PB_0_10_14="" + IGNORE_GST_PB_0_10_15="" AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface]) fi AC_SUBST(IGNORE_GST_0_10_3) @@ -207,8 +223,10 @@ AC_SUBST(IGNORE_GST_0_10_11) AC_SUBST(IGNORE_GST_0_10_12) AC_SUBST(IGNORE_GST_0_10_13) AC_SUBST(IGNORE_GST_0_10_14) +AC_SUBST(IGNORE_GST_0_10_15) AC_SUBST(IGNORE_GST_PB_0_10_11) AC_SUBST(IGNORE_GST_PB_0_10_14) +AC_SUBST(IGNORE_GST_PB_0_10_15) AC_SUBST(HAVE_VIDEO_ORIENTATION) dnl check for gstreamer-base; uninstalled is selected preferentially diff --git a/gst/Makefile.am b/gst/Makefile.am index 5f61770c13..44aedd11b7 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -33,8 +33,10 @@ versioned_overrides = \ gst-0.10.12.ignore \ gst-0.10.13.ignore \ gst-0.10.14.ignore \ + gst-0.10.15.ignore \ gst-pb-0.10.11.ignore \ gst-pb-0.10.14.ignore \ + gst-pb-0.10.15.ignore \ gst-disable-loadsave.ignore INCLUDES = $(PYTHON_INCLUDES) diff --git a/gst/base.defs b/gst/base.defs index 39e6c85595..3bf7dcba43 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -210,6 +210,36 @@ (return-type "gboolean") ) +(define-method set_async_enabled + (of-object "GstBaseSink") + (c-name "gst_base_sink_set_async_enabled") + (return-type "none") + (parameters + '("gboolean" "enabled") + ) +) + +(define-method is_async_enabled + (of-object "GstBaseSink") + (c-name "gst_base_sink_is_async_enabled") + (return-type "gboolean") +) + +(define-method set_ts_offset + (of-object "GstBaseSink") + (c-name "gst_base_sink_set_ts_offset") + (return-type "none") + (parameters + '("GstClockTimeDiff" "offset") + ) +) + +(define-method get_ts_offset + (of-object "GstBaseSink") + (c-name "gst_base_sink_get_ts_offset") + (return-type "GstClockTimeDiff") +) + (define-method query_latency (of-object "GstBaseSink") (c-name "gst_base_sink_query_latency") @@ -370,6 +400,21 @@ ) ) +(define-method set_do_timestamp + (of-object "GstBaseSrc") + (c-name "gst_base_src_set_do_timestamp") + (return-type "none") + (parameters + '("gboolean" "live") + ) +) + +(define-method get_do_timestamp + (of-object "GstBaseSrc") + (c-name "gst_base_src_get_do_timestamp") + (return-type "gboolean") +) + (define-virtual get_caps (of-object "GstBaseSrc") (return-type "GstCaps*") diff --git a/gst/gst-0.10.15.ignore b/gst/gst-0.10.15.ignore new file mode 100644 index 0000000000..76f12a7476 --- /dev/null +++ b/gst/gst-0.10.15.ignore @@ -0,0 +1,6 @@ +%% +ignore + gst_pad_peer_query + gst_registry_add_path + gst_structure_get_uint +%% diff --git a/gst/gst-pb-0.10.15.ignore b/gst/gst-pb-0.10.15.ignore new file mode 100644 index 0000000000..dff8d9fd99 --- /dev/null +++ b/gst/gst-pb-0.10.15.ignore @@ -0,0 +1,13 @@ +%% +ignore + gst_base_sink_set_async_enabled + gst_base_sink_is_async_enabled + gst_base_sink_set_ts_offset + gst_base_sink_get_ts_offset + gst_base_src_set_do_timestamp + gst_base_src_get_do_timestamp +%% +ignore-type + LFOControlSource + LFOWaveform +%% \ No newline at end of file diff --git a/gst/gst.defs b/gst/gst.defs index f37e6a9064..0d0ee2fd7d 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -1069,10 +1069,10 @@ (c-name "gst_element_class_set_details_simple") (return-type "none") (parameters - '("gchar*" "longname") - '("gchar*" "classification") - '("gchar*" "description") - '("gchar*" "author") + '("const-gchar*" "longname") + '("const-gchar*" "classification") + '("const-gchar*" "description") + '("const-gchar*" "author") ) ) @@ -4092,6 +4092,15 @@ ) ) +(define-method peer_query + (of-object "GstPad") + (c-name "gst_pad_peer_query") + (return-type "gboolean") + (parameters + '("GstQuery*" "query") + ) +) + (define-method set_query_function (of-object "GstPad") (c-name "gst_pad_set_query_function") @@ -4906,6 +4915,15 @@ ) ) +(define-method add_path + (of-object "GstRegistry") + (c-name "gst_registry_add_path") + (return-type "none") + (parameters + '("const-gchar*" "path") + ) +) + (define-method get_path_list (of-object "GstRegistry") (c-name "gst_registry_get_path_list") @@ -5475,6 +5493,16 @@ ) ) +(define-method get_uint + (of-object "GstStructure") + (c-name "gst_structure_get_uint") + (return-type "gboolean") + (parameters + '("const-gchar*" "fieldname") + '("guint*" "value") + ) +) + (define-method get_fourcc (of-object "GstStructure") (c-name "gst_structure_get_fourcc") diff --git a/gst/gst.override b/gst/gst.override index 50601b6e60..823d394e3a 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -38,6 +38,7 @@ headers #include #include +#include #include #include #include diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index cb2a9d5578..1523e75b16 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -12,5 +12,7 @@ include @IGNORE_GST_0_10_13@ @IGNORE_GST_0_10_14@ @IGNORE_GST_PB_0_10_14@ +@IGNORE_GST_0_10_15@ +@IGNORE_GST_PB_0_10_15@ @IGNORE_GST_LOADSAVE@ %% diff --git a/gst/libs.defs b/gst/libs.defs index 1bbc1710f4..ca410766f9 100644 --- a/gst/libs.defs +++ b/gst/libs.defs @@ -22,6 +22,14 @@ (gtype-id "GST_TYPE_INTERPOLATION_CONTROL_SOURCE") ) +(define-object LFOControlSource + (in-module "Gst") + (parent "GstControlSource") + (c-name "GstLFOControlSource") + (gtype-id "GST_TYPE_LFO_CONTROL_SOURCE") +) + + ;; Enumerations and flags ... (define-flags ParamFlags @@ -45,6 +53,19 @@ ) ) +(define-enum LFOWaveform + (in-module "Gst") + (c-name "GstLFOWaveform") + (gtype-id "GST_TYPE_LFO_WAVEFORM") + (values + '("sine" "GST_LFO_WAVEFORM_SINE") + '("square" "GST_LFO_WAVEFORM_SQUARE") + '("saw" "GST_LFO_WAVEFORM_SAW") + '("reverse-saw" "GST_LFO_WAVEFORM_REVERSE_SAW") + '("triangle" "GST_LFO_WAVEFORM_TRIANGLE") + ) +) + (define-enum DPVersion (in-module "Gst") (c-name "GstDPVersion") @@ -512,6 +533,30 @@ +;; From gstlfocontrolsource.h + +(define-function gst_lfo_control_source_get_type + (c-name "gst_lfo_control_source_get_type") + (return-type "GType") + (parameters + ) +) + +(define-function gst_lfo_waveform_get_type + (c-name "gst_lfo_waveform_get_type") + (return-type "GType") + (parameters + ) +) + +(define-function gst_lfo_control_source_new + (c-name "gst_lfo_control_source_new") + (is-constructor-of "GstLfoControlSource") + (return-type "GstLFOControlSource*") + (parameters + ) +) + ;; From ../gstreamer/libs/gst/dataprotocol/dataprotocol.h (define-function dp_init