diff --git a/configure.ac b/configure.ac index 79744e8040..91e5cde934 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,13 @@ then IGNORE_GST_0_10_24="" fi + if test $GST_MINOR_VERSION -lt "25" + then + IGNORE_GST_0_10_25="gst-0.10.25.ignore" + else + IGNORE_GST_0_10_25="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "14" then @@ -210,6 +217,14 @@ then else IGNORE_GST_PB_0_10_23="" fi + + if test $GST_PB_MINOR_VERSION -lt "25" + then + IGNORE_GST_PB_0_10_25="gst-pb-0.10.25.ignore" + else + IGNORE_GST_PB_0_10_25="" + AC_DEFINE_UNQUOTED(HAVE_STREAM_VOLUME_INTERFACE, 1, [We can use the streamvolume interface]) + fi else IGNORE_GST_0_10_13="" IGNORE_GST_0_10_14="" @@ -221,16 +236,19 @@ else IGNORE_GST_0_10_22="" IGNORE_GST_0_10_23="" IGNORE_GST_0_10_24="" + IGNORE_GST_0_10_25="" IGNORE_GST_PB_0_10_14="" IGNORE_GST_PB_0_10_16="" IGNORE_GST_PB_0_10_18="" IGNORE_GST_PB_0_10_23="" + IGNORE_GST_PB_0_10_25="" AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods]) AC_DEFINE_UNQUOTED(HAVE_GST_AUDIO, 1, [We can use the gst-audio library]) AC_DEFINE_UNQUOTED(HAVE_GST_VIDEO, 1, [We can use the gst-video library]) AC_DEFINE_UNQUOTED(HAVE_GST_TAG, 1, [We can use the gst-tag library]) fi AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface]) +AC_DEFINE_UNQUOTED(HAVE_STREAM_VOLUME_INTERFACE, 1, [We can use the streamvolume interface]) AC_SUBST(IGNORE_GST_0_10_13) AC_SUBST(IGNORE_GST_0_10_14) AC_SUBST(IGNORE_GST_0_10_15) @@ -241,10 +259,12 @@ AC_SUBST(IGNORE_GST_0_10_21) AC_SUBST(IGNORE_GST_0_10_22) AC_SUBST(IGNORE_GST_0_10_23) AC_SUBST(IGNORE_GST_0_10_24) +AC_SUBST(IGNORE_GST_0_10_25) AC_SUBST(IGNORE_GST_PB_0_10_14) AC_SUBST(IGNORE_GST_PB_0_10_16) AC_SUBST(IGNORE_GST_PB_0_10_18) AC_SUBST(IGNORE_GST_PB_0_10_23) +AC_SUBST(IGNORE_GST_PB_0_10_25) AC_SUBST(HAVE_VIDEO_ORIENTATION) AC_SUBST(HAVE_PLUGINS_INSTALL) AM_CONDITIONAL(HAVE_GST_AUDIO, $HAVE_GST_AUDIO) diff --git a/gst/Makefile.am b/gst/Makefile.am index 7358b7cc5f..dd40cd5208 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -35,10 +35,12 @@ versioned_overrides = \ gst-0.10.22.ignore \ gst-0.10.23.ignore \ gst-0.10.24.ignore \ + gst-0.10.25.ignore \ gst-pb-0.10.14.ignore \ gst-pb-0.10.16.ignore \ gst-pb-0.10.18.ignore \ gst-pb-0.10.23.ignore \ + gst-pb-0.10.25.ignore \ gst-disable-loadsave.ignore INCLUDES = $(PYTHON_INCLUDES) diff --git a/gst/gst-0.10.25.ignore b/gst/gst-0.10.25.ignore new file mode 100644 index 0000000000..c8a6d4f74f --- /dev/null +++ b/gst/gst-0.10.25.ignore @@ -0,0 +1,4 @@ +%% +ignore + gst_caps_can_intersect +%% \ No newline at end of file diff --git a/gst/gst-pb-0.10.25.ignore b/gst/gst-pb-0.10.25.ignore new file mode 100644 index 0000000000..95e26f8817 --- /dev/null +++ b/gst/gst-pb-0.10.25.ignore @@ -0,0 +1,9 @@ +%% +ignore +%% +ignore-glob + gst_stream_volume_* +%% +ignore-type + GstStreamVolumeFormat +%% diff --git a/gst/gst.defs b/gst/gst.defs index c3a2ae0374..a99a16b125 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -841,6 +841,15 @@ ) ) +(define-method can_intersect + (of-object "GstCaps") + (c-name "gst_caps_can_intersect") + (return-type "gboolean") + (parameters + '("const-GstCaps*" "caps2") + ) +) + (define-method intersect (of-object "GstCaps") (c-name "gst_caps_intersect") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index 02a28fef57..b494495d0b 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -14,5 +14,7 @@ include @IGNORE_GST_0_10_23@ @IGNORE_GST_PB_0_10_23@ @IGNORE_GST_0_10_24@ +@IGNORE_GST_0_10_25@ +@IGNORE_GST_PB_0_10_25@ @IGNORE_GST_LOADSAVE@ %% diff --git a/gst/interfaces.defs b/gst/interfaces.defs index 5fdbe770ba..c88d812e11 100644 --- a/gst/interfaces.defs +++ b/gst/interfaces.defs @@ -165,6 +165,8 @@ '("no-record" "GST_MIXER_TRACK_NO_RECORD") '("no-mute" "GST_MIXER_TRACK_NO_MUTE") '("whitelist" "GST_MIXER_TRACK_WHITELIST") + '("readonly" "GST_MIXER_TRACK_READONLY") + '("writeonly" "GST_MIXER_TRACK_WRITEONLY") ) ) @@ -229,6 +231,17 @@ ) ) +(define-enum StreamVolumeFormat + (in-module "Gst") + (c-name "GstStreamVolumeFormat") + (gtype-id "GST_TYPE_STREAM_VOLUME_FORMAT") + (values + '("linear" "GST_STREAM_VOLUME_FORMAT_LINEAR") + '("cubic" "GST_STREAM_VOLUME_FORMAT_CUBIC") + '("db" "GST_STREAM_VOLUME_FORMAT_DB") + ) +) + (define-flags TunerChannelFlags (in-module "Gst") (c-name "GstTunerChannelFlags") @@ -903,6 +916,53 @@ ) +;; From streamvolume.h + +(define-method set_volume + (of-object "GstStreamVolume") + (c-name "gst_stream_volume_set_volume") + (return-type "none") + (parameters + '("GstStreamVolumeFormat" "format") + '("gdouble" "val") + ) +) + +(define-method get_volume + (of-object "GstStreamVolume") + (c-name "gst_stream_volume_get_volume") + (return-type "gdouble") + (parameters + '("GstStreamVolumeFormat" "format") + ) +) + +(define-method set_mute + (of-object "GstStreamVolume") + (c-name "gst_stream_volume_set_mute") + (return-type "none") + (parameters + '("gboolean" "mute") + ) +) + +(define-method get_mute + (of-object "GstStreamVolume") + (c-name "gst_stream_volume_get_mute") + (return-type "gboolean") +) + +(define-function stream_volume_convert_volume + (c-name "gst_stream_volume_convert_volume") + (return-type "gdouble") + (parameters + '("GstStreamVolumeFormat" "from") + '("GstStreamVolumeFormat" "to") + '("gdouble" "val") + ) +) + + ;; From /opt/gnome/include/gstreamer-0.7/gst/tuner/tuner.h (define-function gst_tuner_get_type diff --git a/gst/interfaces.override b/gst/interfaces.override index 8c0f6e72da..e996db2974 100644 --- a/gst/interfaces.override +++ b/gst/interfaces.override @@ -39,6 +39,9 @@ headers #ifdef HAVE_VIDEO_ORIENTATION_INTERFACE #include #endif +#ifdef HAVE_STREAM_VOLUME_INTERFACE +#include +#endif %% modulename gst.interfaces