diff --git a/ChangeLog b/ChangeLog index 9e18eb872a..e63d0da783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-09-09 Edward Hervey + + * configure.ac: + * gst/base.defs: + * gst/gst-0.10.21.ignore: + * gst/gst.defs: + * gst/gstversion.override.in: + Add API additions for upcoming 0.10.21 core release + 2008-09-04 Edward Hervey * examples/pipeline-tester: diff --git a/common b/common index 8d494854a6..1ff63d8f92 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c +Subproject commit 1ff63d8f92c36bf207434436f4ce75f2a4ea11a4 diff --git a/configure.ac b/configure.ac index 4a101315eb..c72fcebe3f 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,13 @@ then IGNORE_GST_0_10_20="" fi + if test $GST_MINOR_VERSION -lt "21" + then + IGNORE_GST_0_10_21="gst-0.10.21.ignore" + else + IGNORE_GST_0_10_21="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "14" then @@ -175,6 +182,7 @@ else IGNORE_GST_0_10_16="" IGNORE_GST_0_10_18="" IGNORE_GST_0_10_20="" + IGNORE_GST_0_10_21="" IGNORE_GST_PB_0_10_14="" IGNORE_GST_PB_0_10_16="" IGNORE_GST_PB_0_10_18="" @@ -187,6 +195,7 @@ AC_SUBST(IGNORE_GST_0_10_15) AC_SUBST(IGNORE_GST_0_10_16) 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_PB_0_10_14) AC_SUBST(IGNORE_GST_PB_0_10_16) AC_SUBST(IGNORE_GST_PB_0_10_18) diff --git a/gst/base.defs b/gst/base.defs index 3e516c14e9..6a19c4819e 100644 --- a/gst/base.defs +++ b/gst/base.defs @@ -626,6 +626,22 @@ ) ) +(define-method suggest + (of-object "GstBaseTransform") + (c-name "gst_base_transform_suggest") + (return-type "none") + (parameters + '("GstCaps*" "caps") + '("guint" "size") + ) +) + +(define-method reconfigure + (of-object "GstBaseTransform") + (c-name "gst_base_transform_reconfigure") + (return-type "none") +) + (define-virtual transform_caps (of-object "GstBaseTransform") (return-type "GstCaps*") diff --git a/gst/gst-0.10.21.ignore b/gst/gst-0.10.21.ignore new file mode 100644 index 0000000000..b9b54b2bf8 --- /dev/null +++ b/gst/gst-0.10.21.ignore @@ -0,0 +1,11 @@ +%% +ignore + gst_pad_set_iterate_internal_links_function + gst_pad_iterate_internal_links + gst_pad_iterate_internal_links_default + gst_base_transform_suggest + gst_base_transform_reconfigure +%% +ignore-type + +%% diff --git a/gst/gst.defs b/gst/gst.defs index c31699b729..20b728f0f0 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -4164,6 +4164,27 @@ (return-type "GList*") ) +(define-method set_iterate_internal_links_function + (of-object "GstPad") + (c-name "gst_pad_set_iterate_internal_links_function") + (return-type "none") + (parameters + '("GstPadIterIntLinkFunction" "iterintlink") + ) +) + +(define-method iterate_internal_links + (of-object "GstPad") + (c-name "gst_pad_iterate_internal_links") + (return-type "GstIterator*") +) + +(define-method iterate_internal_links_default + (of-object "GstPad") + (c-name "gst_pad_iterate_internal_links_default") + (return-type "GstIterator*") +) + (define-method set_query_type_function (of-object "GstPad") (c-name "gst_pad_set_query_type_function") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index 0575d4d0a9..0e1ba1781a 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -9,5 +9,6 @@ include @IGNORE_GST_0_10_18@ @IGNORE_GST_PB_0_10_18@ @IGNORE_GST_0_10_20@ +@IGNORE_GST_0_10_21@ @IGNORE_GST_LOADSAVE@ %%