From 2b4ab44e91c719f51ea130ce3b872b071db321b3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 17 Jan 2007 04:40:33 +0000 Subject: [PATCH] configure.ac: check for stuff added in gst-pb 0.10.11 Original commit message from CVS: * configure.ac: check for stuff added in gst-pb 0.10.11 * gst/Makefile.am: * gst/interfaces.defs: * gst/interfaces.override: add video orientation interface --- ChangeLog | 9 ++++ configure.ac | 10 +++++ gst/Makefile.am | 3 +- gst/interfaces.defs | 96 +++++++++++++++++++++++++++++++++++++++++ gst/interfaces.override | 1 + 5 files changed, 118 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f3ed047586..a59657c2f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-01-17 Thomas Vander Stichele + + * configure.ac: + check for stuff added in gst-pb 0.10.11 + * gst/Makefile.am: + * gst/interfaces.defs: + * gst/interfaces.override: + add video orientation interface + 2007-01-11 Edward Hervey * gst/gst.defs: diff --git a/configure.ac b/configure.ac index 8b5fbbb635..d02309c9dd 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,14 @@ then IGNORE_GST_0_10_11="" fi + if test $GST_PB_MINOR_VERSION -lt "11" + then + IGNORE_GST_PB_0_10_11="gst-pb-0.10.11.ignore" + else + IGNORE_GST_PB_0_10_11="" + fi + + else IGNORE_GST_0_10_3="" IGNORE_GST_0_10_4="" @@ -149,6 +157,7 @@ else IGNORE_GST_0_10_7="" IGNORE_GST_0_10_10="" IGNORE_GST_0_10_11="" + IGNORE_GST_PB_0_10_11="" fi AC_SUBST(IGNORE_GST_0_10_3) AC_SUBST(IGNORE_GST_0_10_4) @@ -157,6 +166,7 @@ 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) +AC_SUBST(IGNORE_GST_PB_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 0f87b27a4f..d774b653db 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -29,7 +29,8 @@ versioned_overrides = \ gst-0.10.6.ignore \ gst-0.10.7.ignore \ gst-0.10.10.ignore \ - gst-0.10.11.ignore + gst-0.10.11.ignore \ + gst-pb-0.10.11.ignore INCLUDES = $(PYTHON_INCLUDES) EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py diff --git a/gst/interfaces.defs b/gst/interfaces.defs index 9bc3008d7c..5b3d509df8 100644 --- a/gst/interfaces.defs +++ b/gst/interfaces.defs @@ -784,3 +784,99 @@ ) +;; -*- scheme -*- +; object definitions ... +;; Enumerations and flags ... + + +;; From videoorientation.h + +;; +;; interface definitions ... +;; + +(define-interface VideoOrientation + (in-module "Gst") + (c-name "GstVideoOrientation") + (gtype-id "GST_TYPE_VIDEO_ORIENTATION") + (vtable "GstVideoOrientationClass") +) + +(define-function gst_video_orientation_get_type + (c-name "gst_video_orientation_get_type") + (return-type "GType") +) + +(define-method get_hflip + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_get_hflip") + (return-type "gboolean") + (parameters + '("gboolean*" "flip") + ) +) + +(define-method get_vflip + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_get_vflip") + (return-type "gboolean") + (parameters + '("gboolean*" "flip") + ) +) + +(define-method get_hcenter + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_get_hcenter") + (return-type "gboolean") + (parameters + '("gint*" "center") + ) +) + +(define-method get_vcenter + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_get_vcenter") + (return-type "gboolean") + (parameters + '("gint*" "center") + ) +) + +(define-method set_hflip + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_set_hflip") + (return-type "gboolean") + (parameters + '("gboolean" "flip") + ) +) + +(define-method set_vflip + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_set_vflip") + (return-type "gboolean") + (parameters + '("gboolean" "flip") + ) +) + +(define-method set_hcenter + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_set_hcenter") + (return-type "gboolean") + (parameters + '("gint" "center") + ) +) + +(define-method set_vcenter + (of-object "GstVideoOrientation") + (c-name "gst_video_orientation_set_vcenter") + (return-type "gboolean") + (parameters + '("gint" "center") + ) +) + + diff --git a/gst/interfaces.override b/gst/interfaces.override index 93013dfe00..3a2df89b30 100644 --- a/gst/interfaces.override +++ b/gst/interfaces.override @@ -34,6 +34,7 @@ headers #include #include #include +#include %% modulename gst.interfaces