diff --git a/ChangeLog b/ChangeLog index 11b7eec205..caa373f307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-05-09 Edward Hervey + + * configure.ac: + * gst/Makefile.am: + * gst/gst-0.10.6.ignore: + * gst/gst.defs: + * gst/gstversion.override.in: + Update for API changes. + Added ignore files for core 0.10.6 API additions. + 2006-05-09 Edward Hervey * gst/gst.override: diff --git a/configure.ac b/configure.ac index deb4561430..a8295e35ce 100644 --- a/configure.ac +++ b/configure.ac @@ -106,14 +106,23 @@ then else IGNORE_GST_0_10_5="" fi + + if test $GST_MINOR_VERSION -lt "6" + then + IGNORE_GST_0_10_6="gst-0.10.6.ignore" + else + IGNORE_GST_0_10_6="" + fi else IGNORE_GST_0_10_3="" IGNORE_GST_0_10_4="" IGNORE_GST_0_10_5="" + IGNORE_GST_0_10_6="" fi AC_SUBST(IGNORE_GST_0_10_3) AC_SUBST(IGNORE_GST_0_10_4) AC_SUBST(IGNORE_GST_0_10_5) +AC_SUBST(IGNORE_GST_0_10_6) 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 8fb1a658e2..2802333dd2 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -25,7 +25,8 @@ noinst_HEADERS = common.h pygstvalue.h pygstminiobject.h pygstobject.h pygstexce versioned_overrides = \ gst-0.10.3.ignore \ gst-0.10.4.ignore \ - gst-0.10.5.ignore + gst-0.10.5.ignore \ + gst-0.10.6.ignore INCLUDES = $(PYTHON_INCLUDES) EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py diff --git a/gst/gst-0.10.6.ignore b/gst/gst-0.10.6.ignore new file mode 100644 index 0000000000..3a31b8ac95 --- /dev/null +++ b/gst/gst-0.10.6.ignore @@ -0,0 +1,6 @@ +%% +ignore + gst_event_new_new_segment_full + gst_event_parse_new_segment_full + gst_segment_set_newsegment_full +%% diff --git a/gst/gst.defs b/gst/gst.defs index 01ad3586aa..12cbc73329 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -1837,6 +1837,21 @@ ) ) +(define-function event_new_new_segment_full + (c-name "gst_event_new_new_segment_full") + (return-type "GstEvent*") + (caller-owns-return #t) + (parameters + '("gboolean" "update") + '("gdouble" "rate") + '("gdouble" "applied_rate") + '("GstFormat" "format") + '("gint64" "start") + '("gint64" "stop") + '("gint64" "position") + ) +) + (define-method parse_new_segment (of-object "GstEvent") (c-name "gst_event_parse_new_segment") @@ -1860,6 +1875,21 @@ ) ) +(define-method parse_new_segment_full + (of-object "GstEvent") + (c-name "gst_event_parse_new_segment_full") + (return-type "none") + (parameters + '("gboolean*" "update") + '("gdouble*" "rate") + '("gdouble*" "applied_rate") + '("GstFormat*" "format") + '("gint64*" "start") + '("gint64*" "stop") + '("gint64*" "position") + ) +) + (define-method parse_tag (of-object "GstEvent") (c-name "gst_event_parse_tag") @@ -4824,6 +4854,21 @@ ) ) +(define-method set_newsegment_full + (of-object "GstSegment") + (c-name "gst_segment_set_newsegment_full") + (return-type "none") + (parameters + '("gboolean" "update") + '("gdouble" "rate") + '("gdouble" "applied_rate") + '("GstFormat" "format") + '("gint64" "start") + '("gint64" "stop") + '("gint64" "time") + ) +) + (define-method to_stream_time (of-object "GstSegment") (c-name "gst_segment_to_stream_time") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index fd417b8b26..b4584e078d 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -3,4 +3,5 @@ include @IGNORE_GST_0_10_3@ @IGNORE_GST_0_10_4@ @IGNORE_GST_0_10_5@ +@IGNORE_GST_0_10_6@ %%