[gstreamermm] Add Gst::StreamVolume interface.



commit ab8aa3f514d5743f35db2660ef085451a37f74cd
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Fri Sep 25 15:55:30 2009 -0400

    	Add Gst::StreamVolume interface.
    
    	* tools/extra_defs_gen/generate_defs_gst.cc: Add GstStreamVolume type
    	for signal and property defs generation.
    	* gstreamer/src/gst_enums.defs:
    	* gstreamer/src/gst_enums.defs.patch:
    	* gstreamer/src/gst_methods.defs:
    	* gstreamer/src/gst_signals.defs: Regenerate defs and update
    	corresponding patch files.
    
    	* gstreamer/gstreamermm.h:
    	* gstreamer/src/filelist.am:
    	* gstreamer/src/streamvolume.ccg:
    	* gstreamer/src/streamvolume.hg: Add Gst::StreamVolume interface.
    	* tools/m4/convert_gst.m4: Add conversion of Gst::StreamVolumeFormat
    	enum.
    
    	* tools/m4/plugingen_gstreamermm.m4: Add a Gst::StreamVolume interface
    	C/C++ conversion for plug-ins that inherit from the interface (needed
    	during plug-in generation).
    
    	* configure.ac: Increment minimum mm-common version requirement.

 ChangeLog                                 |   25 +
 configure.ac                              |    2 +-
 gstreamer/gstreamermm.h                   |    1 +
 gstreamer/src/filelist.am                 |    1 +
 gstreamer/src/gst_enums.defs              |  202 ++++---
 gstreamer/src/gst_enums.defs.patch        |  808 ++++++++++-------------------
 gstreamer/src/gst_methods.defs            |  529 ++++++++++++++++++-
 gstreamer/src/gst_signals.defs            |  141 +++++-
 gstreamer/src/streamvolume.ccg            |   20 +
 gstreamer/src/streamvolume.hg             |   51 ++
 tools/extra_defs_gen/generate_defs_gst.cc |    2 +
 tools/m4/convert_gst.m4                   |    1 +
 tools/m4/plugingen_gstreamermm.m4         |    1 +
 13 files changed, 1150 insertions(+), 634 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3a36db9..cf96ef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-09-25  José Alburquerque  <jaalburqu svn gnome org>
+
+	Add Gst::StreamVolume interface.
+
+	* tools/extra_defs_gen/generate_defs_gst.cc: Add GstStreamVolume type
+	for signal and property defs generation.
+	* gstreamer/src/gst_enums.defs:
+	* gstreamer/src/gst_enums.defs.patch:
+	* gstreamer/src/gst_methods.defs:
+	* gstreamer/src/gst_signals.defs: Regenerate defs and update
+	corresponding patch files.
+
+	* gstreamer/gstreamermm.h:
+	* gstreamer/src/filelist.am:
+	* gstreamer/src/streamvolume.ccg:
+	* gstreamer/src/streamvolume.hg: Add Gst::StreamVolume interface.
+	* tools/m4/convert_gst.m4: Add conversion of Gst::StreamVolumeFormat
+	enum.
+
+	* tools/m4/plugingen_gstreamermm.m4: Add a Gst::StreamVolume interface
+	C/C++ conversion for plug-ins that inherit from the interface (needed
+	during plug-in generation).
+
+	* configure.ac: Increment minimum mm-common version requirement.
+
 0.10.5.2:
 
 2009-09-21  José Alburquerque  <jaalburqu svn gnome org>
diff --git a/configure.ac b/configure.ac
index 2caf55e..6eef403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([config.h gstreamer/gstreamermmconfig.h])
 
-MM_PREREQ([0.7.2])
+MM_PREREQ([0.8])
 MM_INIT_MODULE([gstreamermm-0.10])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
diff --git a/gstreamer/gstreamermm.h b/gstreamer/gstreamermm.h
index 3b6c313..c74906f 100644
--- a/gstreamer/gstreamermm.h
+++ b/gstreamer/gstreamermm.h
@@ -72,6 +72,7 @@
 #include <gstreamermm/mixertrack.h>
 #include <gstreamermm/navigation.h>
 #include <gstreamermm/propertyprobe.h>
+#include <gstreamermm/streamvolume.h>
 #include <gstreamermm/tuner.h>
 #include <gstreamermm/tunerchannel.h>
 #include <gstreamermm/tunernorm.h>
diff --git a/gstreamer/src/filelist.am b/gstreamer/src/filelist.am
index 31bfae0..3049458 100644
--- a/gstreamer/src/filelist.am
+++ b/gstreamer/src/filelist.am
@@ -132,6 +132,7 @@ files_hg  =                     \
         registry.hg             \
         ringbuffer.hg           \
         segment.hg              \
+        streamvolume.hg         \
         structure.hg            \
         systemclock.hg          \
         taglist.hg              \
diff --git a/gstreamer/src/gst_enums.defs b/gstreamer/src/gst_enums.defs
index 609a8e6..5b3b8cc 100644
--- a/gstreamer/src/gst_enums.defs
+++ b/gstreamer/src/gst_enums.defs
@@ -1,6 +1,6 @@
 ;; Apply gst_enums.defs.patch after regenerating.
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstbin.h
+;; From gstbin.h
 
 (define-enum-extended BinFlags
   (in-module "Gst")
@@ -9,7 +9,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstbuffer.h
+;; From gstbuffer.h
 
 (define-enum-extended BufferFlag
   (in-module "Gst")
@@ -38,7 +38,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstbufferlist.h
+;; From gstbufferlist.h
 
 (define-enum-extended BufferListItem
   (in-module "Gst")
@@ -50,7 +50,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstbus.h
+;; From gstbus.h
 
 (define-enum-extended BusFlags
   (in-module "Gst")
@@ -71,7 +71,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstcaps.h
+;; From gstcaps.h
 
 (define-flags-extended CapsFlags
   (in-module "Gst")
@@ -81,7 +81,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstclock.h
+;; From gstclock.h
 
 (define-enum-extended ClockReturn
   (in-module "Gst")
@@ -120,7 +120,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstdebugutils.h
+;; From gstdebugutils.h
 
 (define-flags-extended DebugGraphDetails
   (in-module "Gst")
@@ -133,7 +133,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstelement.h
+;; From gstelement.h
 
 (define-enum-extended State
   (in-module "Gst")
@@ -184,7 +184,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsterror.h
+;; From gsterror.h
 
 (define-enum-extended CoreError
   (in-module "Gst")
@@ -265,7 +265,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstevent.h
+;; From gstevent.h
 
 (define-flags-extended EventTypeFlags
   (in-module "Gst")
@@ -301,7 +301,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstformat.h
+;; From gstformat.h
 
 (define-enum-extended Format
   (in-module "Gst")
@@ -316,7 +316,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstindex.h
+;; From gstindex.h
 
 (define-enum-extended IndexCertainty
   (in-module "Gst")
@@ -380,7 +380,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstinfo.h
+;; From gstinfo.h
 
 (define-enum-extended DebugLevel
   (in-module "Gst")
@@ -423,7 +423,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstiterator.h
+;; From gstiterator.h
 
 (define-enum-extended IteratorResult
   (in-module "Gst")
@@ -446,7 +446,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstmessage.h
+;; From gstmessage.h
 
 (define-flags-extended MessageType
   (in-module "Gst")
@@ -504,7 +504,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstminiobject.h
+;; From gstminiobject.h
 
 (define-flags-extended MiniObjectFlags
   (in-module "Gst")
@@ -515,7 +515,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstobject.h
+;; From gstobject.h
 
 (define-flags-extended ObjectFlags
   (in-module "Gst")
@@ -527,7 +527,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstpad.h
+;; From gstpad.h
 
 (define-enum-extended PadLinkReturn
   (in-module "Gst")
@@ -593,7 +593,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstpadtemplate.h
+;; From gstpadtemplate.h
 
 (define-enum-extended PadPresence
   (in-module "Gst")
@@ -614,7 +614,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstparse.h
+;; From gstparse.h
 
 (define-enum-extended ParseError
   (in-module "Gst")
@@ -639,7 +639,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstpipeline.h
+;; From gstpipeline.h
 
 (define-enum-extended PipelineFlags
   (in-module "Gst")
@@ -648,7 +648,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstpluginfeature.h
+;; From gstpluginfeature.h
 
 (define-enum-extended Rank
   (in-module "Gst")
@@ -661,7 +661,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstplugin.h
+;; From gstplugin.h
 
 (define-enum-extended PluginError
   (in-module "Gst")
@@ -692,7 +692,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstquark.h
+;; From gstquark.h
 
 (define-enum-extended QuarkId
   (in-module "Gst")
@@ -793,7 +793,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstquery.h
+;; From gstquery.h
 
 (define-enum-extended QueryType
   (in-module "Gst")
@@ -826,7 +826,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstsystemclock.h
+;; From gstsystemclock.h
 
 (define-enum-extended ClockType
   (in-module "Gst")
@@ -837,7 +837,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsttaglist.h
+;; From gsttaglist.h
 
 (define-enum-extended TagMergeMode
   (in-module "Gst")
@@ -866,7 +866,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsttask.h
+;; From gsttask.h
 
 (define-enum-extended TaskState
   (in-module "Gst")
@@ -878,7 +878,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsttrace.h
+;; From gsttrace.h
 
 (define-flags-extended AllocTraceFlags
   (in-module "Gst")
@@ -889,7 +889,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsttypefind.h
+;; From gsttypefind.h
 
 (define-enum-extended TypeFindProbability
   (in-module "Gst")
@@ -903,7 +903,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gsturi.h
+;; From gsturi.h
 
 (define-enum-extended URIType
   (in-module "Gst")
@@ -915,7 +915,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/gst/gstutils.h
+;; From gstutils.h
 
 (define-enum-extended SearchMode
   (in-module "Gst")
@@ -927,7 +927,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/libs/gst/base/gstbasesrc.h
+;; From gstbasesrc.h
 
 (define-enum-extended BaseSrcFlags
   (in-module "Gst")
@@ -936,7 +936,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/libs/gst/controller/gstinterpolationcontrolsource.h
+;; From gstinterpolationcontrolsource.h
 
 (define-enum-extended InterpolateMode
   (in-module "Gst")
@@ -951,7 +951,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/libs/gst/controller/gstlfocontrolsource.h
+;; From gstlfocontrolsource.h
 
 (define-enum-extended LFOWaveform
   (in-module "Gst")
@@ -965,7 +965,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/libs/gst/dataprotocol/dataprotocol.h
+;; From dataprotocol.h
 
 (define-enum-extended DPVersion
   (in-module "Gst")
@@ -997,7 +997,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/plugins/elements/gstfakesink.h
+;; From gstfakesink.h
 
 (define-enum-extended FakeSinkStateError
   (in-module "Gst")
@@ -1013,7 +1013,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/plugins/elements/gstfakesrc.h
+;; From gstfakesrc.h
 
 (define-enum-extended FakeSrcOutputType
   (in-module "Gst")
@@ -1073,7 +1073,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gstreamer/plugins/elements/gsttee.h
+;; From gsttee.h
 
 (define-enum-extended TeePullMode
   (in-module "Gst")
@@ -1084,7 +1084,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/app/gstappsrc.h
+;; From gstappsrc.h
 
 (define-enum-extended AppStreamType
   (in-module "Gst")
@@ -1106,7 +1106,8 @@
     '("downstream" "GST_QUEUE_LEAKY_DOWNSTREAM" "2")
   )
 )
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.h
+
+;; From gstbaseaudiosink.h
 
 (define-enum-extended BaseAudioSinkSlaveMethod
   (in-module "Gst")
@@ -1118,7 +1119,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosrc.h
+;; From gstbaseaudiosrc.h
 
 (define-enum-extended BaseAudioSrcSlaveMethod
   (in-module "Gst")
@@ -1131,7 +1132,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstringbuffer.h
+;; From gstringbuffer.h
 
 (define-enum-extended RingBufferState
   (in-module "Gst")
@@ -1219,7 +1220,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/multichannel.h
+;; From multichannel.h
 
 (define-enum-extended AudioChannelPosition
   (in-module "Gst")
@@ -1243,7 +1244,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/cdda/gstcddabasesrc.h
+;; From gstcddabasesrc.h
 
 (define-enum-extended CddaBaseSrcMode
   (in-module "Gst")
@@ -1254,7 +1255,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/fft/gstfft.h
+;; From gstfft.h
 
 (define-enum-extended FFTWindow
   (in-module "Gst")
@@ -1268,7 +1269,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/colorbalance.h
+;; From colorbalance.h
 
 (define-enum-extended ColorBalanceType
   (in-module "Gst")
@@ -1279,7 +1280,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/mixer.h
+;; From mixer.h
 
 (define-enum-extended MixerType
   (in-module "Gst")
@@ -1315,7 +1316,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/mixertrack.h
+;; From mixertrack.h
 
 (define-flags-extended MixerTrackFlags
   (in-module "Gst")
@@ -1330,10 +1331,12 @@
     '("no-record" "GST_MIXER_TRACK_NO_RECORD" "1<<6")
     '("no-mute" "GST_MIXER_TRACK_NO_MUTE" "1<<7")
     '("whitelist" "GST_MIXER_TRACK_WHITELIST" "1<<8")
+    '("readonly" "GST_MIXER_TRACK_READONLY" "1<<9")
+    '("writeonly" "GST_MIXER_TRACK_WRITEONLY" "1<<10")
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/navigation.h
+;; From navigation.h
 
 (define-enum-extended NavigationCommand
   (in-module "Gst")
@@ -1392,7 +1395,19 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/interfaces/tunerchannel.h
+;; From streamvolume.h
+
+(define-enum-extended StreamVolumeFormat
+  (in-module "Gst")
+  (c-name "GstStreamVolumeFormat")
+  (values
+    '("linear" "GST_STREAM_VOLUME_FORMAT_LINEAR" "0")
+    '("cubic" "GST_STREAM_VOLUME_FORMAT_CUBIC" "1")
+    '("db" "GST_STREAM_VOLUME_FORMAT_DB" "2")
+  )
+)
+
+;; From tunerchannel.h
 
 (define-flags-extended TunerChannelFlags
   (in-module "Gst")
@@ -1405,7 +1420,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/netbuffer/gstnetbuffer.h
+;; From gstnetbuffer.h
 
 (define-enum-extended NetType
   (in-module "Gst")
@@ -1417,7 +1432,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtp/gstrtcpbuffer.h
+;; From gstrtcpbuffer.h
 
 (define-enum-extended RTCPType
   (in-module "Gst")
@@ -1464,7 +1479,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtp/gstrtppayloads.h
+;; From gstrtppayloads.h
 
 (define-enum-extended RTPPayload
   (in-module "Gst")
@@ -1499,7 +1514,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtsp/gstrtspdefs.h
+;; From gstrtspdefs.h
 
 (define-enum-extended RTSPResult
   (in-module "Gst")
@@ -1564,6 +1579,7 @@
   (values
     '("invalid" "GST_RTSP_VERSION_INVALID" "0x00")
     '("1-0" "GST_RTSP_VERSION_1_0" "0x10")
+    '("1-1" "GST_RTSP_VERSION_1_1" "0x11")
   )
 )
 
@@ -1583,6 +1599,8 @@
     '("setup" "GST_RTSP_SETUP" "1 << 8")
     '("set-parameter" "GST_RTSP_SET_PARAMETER" "1 << 9")
     '("teardown" "GST_RTSP_TEARDOWN" "1 << 10")
+    '("get" "GST_RTSP_GET" "1 << 11")
+    '("post" "GST_RTSP_POST" "1 << 12")
   )
 )
 
@@ -1676,6 +1694,12 @@
     '("x-rtp-info" "GST_RTSP_HDR_X_RTP_INFO" "73")
     '("x-startupprofile" "GST_RTSP_HDR_X_STARTUPPROFILE" "74")
     '("timestamp" "GST_RTSP_HDR_TIMESTAMP" "75")
+    '("authentication-info" "GST_RTSP_HDR_AUTHENTICATION_INFO" "76")
+    '("host" "GST_RTSP_HDR_HOST" "77")
+    '("pragma" "GST_RTSP_HDR_PRAGMA" "78")
+    '("x-server-ip-address" "GST_RTSP_HDR_X_SERVER_IP_ADDRESS" "79")
+    '("x-sessioncookie" "GST_RTSP_HDR_X_SESSIONCOOKIE" "80")
+    '("last" "GST_RTSP_HDR_LAST" "81")
   )
 )
 
@@ -1731,7 +1755,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtsp/gstrtspmessage.h
+;; From gstrtspmessage.h
 
 (define-enum-extended RTSPMsgType
   (in-module "Gst")
@@ -1740,11 +1764,13 @@
     '("invalid" "GST_RTSP_MESSAGE_INVALID" "0")
     '("request" "GST_RTSP_MESSAGE_REQUEST" "1")
     '("response" "GST_RTSP_MESSAGE_RESPONSE" "2")
-    '("data" "GST_RTSP_MESSAGE_DATA" "3")
+    '("http-request" "GST_RTSP_MESSAGE_HTTP_REQUEST" "3")
+    '("http-response" "GST_RTSP_MESSAGE_HTTP_RESPONSE" "4")
+    '("data" "GST_RTSP_MESSAGE_DATA" "5")
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtsp/gstrtsprange.h
+;; From gstrtsprange.h
 
 (define-enum-extended RTSPRangeUnit
   (in-module "Gst")
@@ -1768,7 +1794,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/rtsp/gstrtsptransport.h
+;; From gstrtsptransport.h
 
 (define-flags-extended RTSPTransMode
   (in-module "Gst")
@@ -1802,7 +1828,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/sdp/gstsdp.h
+;; From gstsdp.h
 
 (define-enum-extended SDPResult
   (in-module "Gst")
@@ -1813,7 +1839,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.h
+;; From gsttagdemux.h
 
 (define-enum-extended TagDemuxResult
   (in-module "Gst")
@@ -1825,7 +1851,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/tag/tag.h
+;; From tag.h
 
 (define-enum-extended TagImageType
   (in-module "Gst")
@@ -1854,7 +1880,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/pbutils/install-plugins.h
+;; From install-plugins.h
 
 (define-enum-extended InstallPluginsReturn
   (in-module "Gst")
@@ -1874,7 +1900,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/video/video.h
+;; From video.h
 
 (define-enum-extended VideoFormat
   (in-module "Gst")
@@ -1905,7 +1931,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/adder/gstadder.h
+;; From gstadder.h
 
 (define-enum-extended AdderFormat
   (in-module "Gst")
@@ -1917,7 +1943,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/audioconvert/audioconvert.h
+;; From audioconvert.h
 
 (define-enum-extended AudioConvertDithering
   (in-module "Gst")
@@ -1942,7 +1968,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/audiotestsrc/gstaudiotestsrc.h
+;; From gstaudiotestsrc.h
 
 (define-enum-extended AudioTestSrcWave
   (in-module "Gst")
@@ -1973,7 +1999,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/gdp/gstgdpdepay.h
+;; From gstgdpdepay.h
 
 (define-enum-extended GDPDepayState
   (in-module "Gst")
@@ -1987,7 +2013,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstfactorylists.h
+;; From gstfactorylists.h
 
 (define-flags-extended FactoryListType
   (in-module "Gst")
@@ -2000,7 +2026,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstplay-enum.h
+;; From gstplay-enum.h
 
 (define-enum-extended AutoplugSelectResult
   (in-module "Gst")
@@ -2027,7 +2053,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gstplaysink.h
+;; From gstplaysink.h
 
 (define-enum-extended PlaySinkType
   (in-module "Gst")
@@ -2044,7 +2070,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/playback/gststreaminfo.h
+;; From gststreaminfo.h
 
 (define-enum-extended StreamType
   (in-module "Gst")
@@ -2059,7 +2085,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/subparse/gstsubparse.h
+;; From gstsubparse.h
 
 (define-enum-extended SubParseFormat
   (in-module "Gst")
@@ -2076,7 +2102,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gstmultifdsink.h
+;; From gstmultifdsink.h
 
 (define-enum-extended MultiFdSinkFlags
   (in-module "Gst")
@@ -2134,7 +2160,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpclientsink.h
+;; From gsttcpclientsink.h
 
 (define-enum-extended TCPClientSinkFlags
   (in-module "Gst")
@@ -2143,7 +2169,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpclientsrc.h
+;; From gsttcpclientsrc.h
 
 (define-enum-extended TCPClientSrcFlags
   (in-module "Gst")
@@ -2152,7 +2178,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcp.h
+;; From gsttcp.h
 
 (define-enum-extended TCPProtocol
   (in-module "Gst")
@@ -2163,7 +2189,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpplugin.h
+;; From gsttcpplugin.h
 
 (define-enum-extended _TCP_Control
   (in-module "Gst")
@@ -2175,7 +2201,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpserversink.h
+;; From gsttcpserversink.h
 
 (define-enum-extended TCPServerSinkFlags
   (in-module "Gst")
@@ -2184,7 +2210,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/tcp/gsttcpserversrc.h
+;; From gsttcpserversrc.h
 
 (define-enum-extended TCPServerSrcFlags
   (in-module "Gst")
@@ -2193,7 +2219,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/videoscale/gstvideoscale.h
+;; From gstvideoscale.h
 
 (define-enum-extended VideoScaleMethod
   (in-module "Gst")
@@ -2205,7 +2231,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h
+;; From gstvideotestsrc.h
 
 (define-enum-extended VideoTestSrcPattern
   (in-module "Gst")
@@ -2238,7 +2264,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/alsa/gstalsamixer.h
+;; From gstalsamixer.h
 
 (define-flags-extended AlsaMixerDirection
   (in-module "Gst")
@@ -2250,7 +2276,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/ogg/gstoggdemux.h
+;; From gstoggdemux.h
 
 (define-enum-extended OggPadMode
   (in-module "Gst")
@@ -2261,7 +2287,9 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
+;; From gstoggmux.h
+
+;; From gsttextoverlay.h
 
 (define-enum-extended TextOverlayVAlign
   (in-module "Gst")
@@ -2304,7 +2332,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextrender.h
+;; From gsttextrender.h
 
 (define-enum-extended TextRenderVAlign
   (in-module "Gst")
@@ -2336,7 +2364,7 @@
   )
 )
 
-;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
+;; From gsttheoraenc.h
 
 (define-enum-extended TheoraEncBorderMode
   (in-module "Gst")
diff --git a/gstreamer/src/gst_enums.defs.patch b/gstreamer/src/gst_enums.defs.patch
index 130738e..a022d6a 100644
--- a/gstreamer/src/gst_enums.defs.patch
+++ b/gstreamer/src/gst_enums.defs.patch
@@ -1,531 +1,277 @@
-*** gst_enums.defs	2009-08-19 15:40:29.000000000 -0400
---- gst_enums.defs.new	2009-08-19 15:52:42.000000000 -0400
-***************
-*** 1,3 ****
---- 1,5 ----
-+ ;; Apply gst_enums.defs.patch after regenerating.
-+ 
-  ;; From /usr/src/jhbuild-sources/gstreamer/gst/gstbin.h
-  
-  (define-enum-extended BinFlags
-***************
-*** 13,19 ****
-    (in-module "Gst")
-    (c-name "GstBufferFlag")
-    (values
-!     '("y" "GST_BUFFER_FLAG_READONLY" "#error")
-    )
-  )
-  
---- 15,30 ----
-    (in-module "Gst")
-    (c-name "GstBufferFlag")
-    (values
-!     '("readonly" "GST_BUFFER_FLAG_READONLY" "GST_MINI_OBJECT_FLAG_READONLY")
-!     '("preroll" "GST_BUFFER_FLAG_PREROLL" "GST_MINI_OBJECT_FLAG_LAST << 0")
-!     '("discont" "GST_BUFFER_FLAG_DISCONT" "GST_MINI_OBJECT_FLAG_LAST << 1")
-!     '("in-caps" "GST_BUFFER_FLAG_IN_CAPS" "GST_MINI_OBJECT_FLAG_LAST << 2")
-!     '("gap" "GST_BUFFER_FLAG_GAP" "GST_MINI_OBJECT_FLAG_LAST << 3")
-!     '("delta-unit" "GST_BUFFER_FLAG_DELTA_UNIT" "GST_MINI_OBJECT_FLAG_LAST << 4")
-!     '("media1" "GST_BUFFER_FLAG_MEDIA1" "GST_MINI_OBJECT_FLAG_LAST << 5")
-!     '("media2" "GST_BUFFER_FLAG_MEDIA2" "GST_MINI_OBJECT_FLAG_LAST << 6")
-!     '("media3" "GST_BUFFER_FLAG_MEDIA3" "GST_MINI_OBJECT_FLAG_LAST << 7")
-!     '("last" "GST_BUFFER_FLAG_LAST" "GST_MINI_OBJECT_FLAG_LAST << 8")
-    )
-  )
-  
-***************
-*** 45,50 ****
---- 56,63 ----
-    (in-module "Gst")
-    (c-name "GstBusFlags")
-    (values
-+     '("flushing" "GST_BUS_FLUSHING" "GST_OBJECT_FLAG_LAST << 0")
-+     '("last" "GST_BUS_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 1")
-    )
-  )
-  
-***************
-*** 97,102 ****
---- 110,122 ----
-    (in-module "Gst")
-    (c-name "GstClockFlags")
-    (values
-+     '("can-do-single-sync" "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC" "GST_OBJECT_FLAG_LAST << 0")
-+     '("can-do-single-async" "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC" "GST_OBJECT_FLAG_LAST << 1")
-+     '("can-do-periodic-sync" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC" "GST_OBJECT_FLAG_LAST << 2")
-+     '("can-do-periodic-async" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC" "GST_OBJECT_FLAG_LAST << 3")
-+     '("can-set-resolution" "GST_CLOCK_FLAG_CAN_SET_RESOLUTION" "GST_OBJECT_FLAG_LAST << 4")
-+     '("can-set-master" "GST_CLOCK_FLAG_CAN_SET_MASTER" "GST_OBJECT_FLAG_LAST << 5")
-+     '("last" "GST_CLOCK_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
-    )
-  )
-  
-***************
-*** 138,147 ****
---- 158,175 ----
-    )
-  )
-  
-+ ;; TODO: See why gmmproc reports errors when values of following enum are
-+ ;; commented in.
-  (define-enum-extended StateChange
-    (in-module "Gst")
-    (c-name "GstStateChange")
-    (values
-+ ;;    '("null-to-ready" "GST_STATE_CHANGE_NULL_TO_READY" "(GST_STATE_NULL<<3) | GST_STATE_READY")
-+ ;;    '("ready-to-paused" "GST_STATE_CHANGE_READY_TO_PAUSED" "(GST_STATE_READY<<3) | GST_STATE_PAUSED")
-+ ;;    '("paused-to-playing" "GST_STATE_CHANGE_PAUSED_TO_PLAYING" "(GST_STATE_PAUSED<<3) | GST_STATE_PLAYING")
-+ ;;    '("playing-to-paused" "GST_STATE_CHANGE_PLAYING_TO_PAUSED" "(GST_STATE_PLAYING<<3) | GST_STATE_PAUSED")
-+ ;;    '("paused-to-ready" "GST_STATE_CHANGE_PAUSED_TO_READY" "(GST_STATE_PAUSED<<3) | GST_STATE_READY")
-+ ;;    '("ready-to-null" "GST_STATE_CHANGE_READY_TO_NULL" "(GST_STATE_READY<<3) | GST_STATE_NULL")
-    )
-  )
-  
-***************
-*** 149,154 ****
---- 177,186 ----
-    (in-module "Gst")
-    (c-name "GstElementFlags")
-    (values
-+     '("locked-state" "GST_ELEMENT_LOCKED_STATE" "GST_OBJECT_FLAG_LAST << 0")
-+     '("is-sink" "GST_ELEMENT_IS_SINK" "GST_OBJECT_FLAG_LAST << 1")
-+     '("unparenting" "GST_ELEMENT_UNPARENTING" "GST_OBJECT_FLAG_LAST << 2")
-+     '("flag-set" "GST_ELEMENT_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 16")
-    )
-  )
-  
-***************
-*** 245,284 ****
-    )
-  )
-  
-- (define-enum-extended EventType
--   (in-module "Gst")
--   (c-name "GstEventType")
--   (values
--     '("gst-event-unknown" "GST_EVENT_UNKNOWN" "#error")
--     '("0)" "0)" "1")
--     '("gst-event-flush-start" "GST_EVENT_FLUSH_START" "2")
--     '("flag(both))" "FLAG(BOTH))" "3")
--     '("gst-event-flush-stop" "GST_EVENT_FLUSH_STOP" "4")
--     '("gst-event-eos" "GST_EVENT_EOS" "6")
--     '("gst-event-newsegment" "GST_EVENT_NEWSEGMENT" "8")
--     '("gst-event-tag" "GST_EVENT_TAG" "10")
--     '("gst-event-buffersize" "GST_EVENT_BUFFERSIZE" "12")
--     '("gst-event-qos" "GST_EVENT_QOS" "14")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "15")
--     '("gst-event-seek" "GST_EVENT_SEEK" "16")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "17")
--     '("gst-event-navigation" "GST_EVENT_NAVIGATION" "18")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "19")
--     '("gst-event-latency" "GST_EVENT_LATENCY" "20")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "21")
--     '("gst-event-step" "GST_EVENT_STEP" "22")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "23")
--     '("gst-event-custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "24")
--     '("flag(upstream))" "FLAG(UPSTREAM))" "25")
--     '("gst-event-custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "26")
--     '("gst-event-custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "28")
--     '("flag(downstream))" "FLAG(DOWNSTREAM))" "29")
--     '("gst-event-custom-both" "GST_EVENT_CUSTOM_BOTH" "30")
--     '("gst-event-custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "32")
--     '("flag(both))" "FLAG(BOTH))" "33")
--   )
-- )
-- 
-  (define-enum-extended SeekType
-    (in-module "Gst")
-    (c-name "GstSeekType")
---- 277,282 ----
-***************
-*** 376,381 ****
---- 374,382 ----
-    (in-module "Gst")
-    (c-name "GstIndexFlags")
-    (values
-+     '("writable" "GST_INDEX_WRITABLE" "GST_OBJECT_FLAG_LAST << 0")
-+     '("readable" "GST_INDEX_READABLE" "GST_OBJECT_FLAG_LAST << 1")
-+     '("last" "GST_INDEX_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
-    )
-  )
-  
-***************
-*** 476,482 ****
-      '("async-done" "GST_MESSAGE_ASYNC_DONE" "1 << 21")
-      '("request-state" "GST_MESSAGE_REQUEST_STATE" "1 << 22")
-      '("step-start" "GST_MESSAGE_STEP_START" "1 << 23")
-!     '("any" "GST_MESSAGE_ANY" "0xFFFFFFFFFFFFFFFF")
-    )
-  )
-  
---- 477,483 ----
-      '("async-done" "GST_MESSAGE_ASYNC_DONE" "1 << 21")
-      '("request-state" "GST_MESSAGE_REQUEST_STATE" "1 << 22")
-      '("step-start" "GST_MESSAGE_STEP_START" "1 << 23")
-!     '("any" "GST_MESSAGE_ANY" "~0")
-    )
-  )
-  
-***************
-*** 583,588 ****
---- 584,595 ----
-    (in-module "Gst")
-    (c-name "GstPadFlags")
-    (values
-+     '("blocked" "GST_PAD_BLOCKED" "GST_OBJECT_FLAG_LAST << 0")
-+     '("flushing" "GST_PAD_FLUSHING" "GST_OBJECT_FLAG_LAST << 1")
-+     '("in-getcaps" "GST_PAD_IN_GETCAPS" "GST_OBJECT_FLAG_LAST << 2")
-+     '("in_setcaps" "GST_PAD_IN_SETCAPS" "GST_OBJECT_FLAG_LAST << 3")
-+     '("blocking" "GST_PAD_BLOCKING" "GST_OBJECT_FLAG_LAST << 4")
-+     '("last" "GST_PAD_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
-    )
-  )
-  
-***************
-*** 602,607 ****
---- 609,616 ----
-    (in-module "Gst")
-    (c-name "GstPadTemplateFlags")
-    (values
-+     '("fixed" "GST_PAD_TEMPLATE_FIXED" "GST_OBJECT_FLAG_LAST << 0")
-+     '("last" "GST_PAD_TEMPLATE_LAST" "GST_OBJECT_FLAG_LAST << 4")
-    )
-  )
-  
-***************
-*** 994,1006 ****
-    (in-module "Gst")
-    (c-name "GstFakeSinkStateError")
-    (values
-!     '("none" "FAKE_SINK_STATE_ERROR_NONE" "0")
-!     '("null-ready" "FAKE_SINK_STATE_ERROR_NULL_READY" "1")
-!     '("ready-paused" "FAKE_SINK_STATE_ERROR_READY_PAUSED" "2")
-!     '("paused-playing" "FAKE_SINK_STATE_ERROR_PAUSED_PLAYING" "3")
-!     '("playing-paused" "FAKE_SINK_STATE_ERROR_PLAYING_PAUSED" "4")
-!     '("paused-ready" "FAKE_SINK_STATE_ERROR_PAUSED_READY" "5")
-!     '("ready-null" "FAKE_SINK_STATE_ERROR_READY_NULL" "6")
-    )
-  )
-  
---- 1003,1015 ----
-    (in-module "Gst")
-    (c-name "GstFakeSinkStateError")
-    (values
-!     '("none" "GST_FAKE_SINK_STATE_ERROR_NONE" "0")
-!     '("null-ready" "GST_FAKE_SINK_STATE_ERROR_NULL_READY" "1")
-!     '("ready-paused" "GST_FAKE_SINK_STATE_ERROR_READY_PAUSED" "2")
-!     '("paused-playing" "GST_FAKE_SINK_STATE_ERROR_PAUSED_PLAYING" "3")
-!     '("playing-paused" "GST_FAKE_SINK_STATE_ERROR_PLAYING_PAUSED" "4")
-!     '("paused-ready" "GST_FAKE_SINK_STATE_ERROR_PAUSED_READY" "5")
-!     '("ready-null" "GST_FAKE_SINK_STATE_ERROR_READY_NULL" "6")
-    )
-  )
-  
-***************
-*** 1010,1023 ****
-    (in-module "Gst")
-    (c-name "GstFakeSrcOutputType")
-    (values
-!     '("first-last-loop" "FAKE_SRC_FIRST_LAST_LOOP" "1")
-!     '("last-first-loop" "FAKE_SRC_LAST_FIRST_LOOP" "2")
-!     '("ping-pong" "FAKE_SRC_PING_PONG" "3")
-!     '("ordered-random" "FAKE_SRC_ORDERED_RANDOM" "4")
-!     '("random" "FAKE_SRC_RANDOM" "5")
-!     '("pattern-loop" "FAKE_SRC_PATTERN_LOOP" "6")
-!     '("ping-pong-pattern" "FAKE_SRC_PING_PONG_PATTERN" "7")
-!     '("get-always-suceeds" "FAKE_SRC_GET_ALWAYS_SUCEEDS" "8")
-    )
-  )
-  
---- 1019,1032 ----
-    (in-module "Gst")
-    (c-name "GstFakeSrcOutputType")
-    (values
-!     '("first-last-loop" "GST_FAKE_SRC_FIRST_LAST_LOOP" "1")
-!     '("last-first-loop" "GST_FAKE_SRC_LAST_FIRST_LOOP" "2")
-!     '("ping-pong" "GST_FAKE_SRC_PING_PONG" "3")
-!     '("ordered-random" "GST_FAKE_SRC_ORDERED_RANDOM" "4")
-!     '("random" "GST_FAKE_SRC_RANDOM" "5")
-!     '("pattern-loop" "GST_FAKE_SRC_PATTERN_LOOP" "6")
-!     '("ping-pong-pattern" "GST_FAKE_SRC_PING_PONG_PATTERN" "7")
-!     '("get-always-suceeds" "GST_FAKE_SRC_GET_ALWAYS_SUCEEDS" "8")
-    )
-  )
-  
-***************
-*** 1025,1032 ****
-    (in-module "Gst")
-    (c-name "GstFakeSrcDataType")
-    (values
-!     '("allocate" "FAKE_SRC_DATA_ALLOCATE" "1")
-!     '("subbuffer" "FAKE_SRC_DATA_SUBBUFFER" "2")
-    )
-  )
-  
---- 1034,1041 ----
-    (in-module "Gst")
-    (c-name "GstFakeSrcDataType")
-    (values
-!     '("allocate" "GST_FAKE_SRC_DATA_ALLOCATE" "1")
-!     '("subbuffer" "GST_FAKE_SRC_DATA_SUBBUFFER" "2")
-    )
-  )
-  
-***************
-*** 1034,1042 ****
-    (in-module "Gst")
-    (c-name "GstFakeSrcSizeType")
-    (values
-!     '("empty" "FAKE_SRC_SIZETYPE_EMPTY" "1")
-!     '("fixed" "FAKE_SRC_SIZETYPE_FIXED" "2")
-!     '("random" "FAKE_SRC_SIZETYPE_RANDOM" "3")
-    )
-  )
-  
---- 1043,1051 ----
-    (in-module "Gst")
-    (c-name "GstFakeSrcSizeType")
-    (values
-!     '("empty" "GST_FAKE_SRC_SIZETYPE_EMPTY" "1")
-!     '("fixed" "GST_FAKE_SRC_SIZETYPE_FIXED" "2")
-!     '("random" "GST_FAKE_SRC_SIZETYPE_RANDOM" "3")
-    )
-  )
-  
-***************
-*** 1044,1054 ****
-    (in-module "Gst")
-    (c-name "GstFakeSrcFillType")
-    (values
-!     '("nothing" "FAKE_SRC_FILLTYPE_NOTHING" "1")
-!     '("zero" "FAKE_SRC_FILLTYPE_ZERO" "2")
-!     '("random" "FAKE_SRC_FILLTYPE_RANDOM" "3")
-!     '("pattern" "FAKE_SRC_FILLTYPE_PATTERN" "4")
-!     '("pattern-cont" "FAKE_SRC_FILLTYPE_PATTERN_CONT" "5")
-    )
-  )
-  
---- 1053,1075 ----
-    (in-module "Gst")
-    (c-name "GstFakeSrcFillType")
-    (values
-!     '("nothing" "GST_FAKE_SRC_FILLTYPE_NOTHING" "1")
-!     '("zero" "GST_FAKE_SRC_FILLTYPE_ZERO" "2")
-!     '("random" "GST_FAKE_SRC_FILLTYPE_RANDOM" "3")
-!     '("pattern" "GST_FAKE_SRC_FILLTYPE_PATTERN" "4")
-!     '("pattern-cont" "GST_FAKE_SRC_FILLTYPE_PATTERN_CONT" "5")
-!   )
-! )
-! 
-! ;; Handwritten for the filesink plug-in (Gst::FileSink).
-! (define-enum-extended FileSinkBufferMode
-!   (in-module "Gst")
-!   (c-name "GstFileSinkBufferMode")
-!   (values
-!     '("default" "GST_FILE_SINK_BUFFER_MODE_DEFAULT" "-1")
-!     '("full" "GST_FILE_SINK_BUFFER_MODE_FULL" "0")
-!     '("line" "GST_FILE_SINK_BUFFER_MODE_LINE" "1")
-!     '("unbuffered" "GST_FILE_SINK_BUFFER_MODE_UNBUFFERED" "2")
-    )
-  )
-  
-***************
-*** 1075,1080 ****
---- 1096,1111 ----
-    )
-  )
-  
-+ ;; Handwritten for the queue plug-in (Gst::Queue).
-+ (define-enum-extended QueueLeaky
-+   (in-module "Gst")
-+   (c-name "GstQueueLeaky")
-+   (values
-+     '("no" "GST_QUEUE_LEAKY_NONE" "0")
-+     '("upstream" "GST_QUEUE_LEAKY_UPSTREAM" "1")
-+     '("downstream" "GST_QUEUE_LEAKY_DOWNSTREAM" "2")
-+   )
-+ )
-  ;; From /usr/src/jhbuild-sources/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.h
-  
-  (define-enum-extended BaseAudioSinkSlaveMethod
-***************
-*** 1892,1901 ****
-    (in-module "Gst")
-    (c-name "GstAudioConvertDithering")
-    (values
-!     '("none" "DITHER_NONE" "0")
-!     '("rpdf" "DITHER_RPDF" "1")
-!     '("tpdf" "DITHER_TPDF" "2")
-!     '("tpdf-hf" "DITHER_TPDF_HF" "3")
-    )
-  )
-  
---- 1923,1932 ----
-    (in-module "Gst")
-    (c-name "GstAudioConvertDithering")
-    (values
-!     '("none" "GST_AUDIO_CONVERT_DITHER_NONE" "0")
-!     '("rpdf" "GST_AUDIO_CONVERT_DITHER_RPDF" "1")
-!     '("tpdf" "GST_AUDIO_CONVERT_DITHER_TPDF" "2")
-!     '("tpdf-hf" "GST_AUDIO_CONVERT_DITHER_TPDF_HF" "3")
-    )
-  )
-  
-***************
-*** 1903,1913 ****
-    (in-module "Gst")
-    (c-name "GstAudioConvertNoiseShaping")
-    (values
-!     '("none" "NOISE_SHAPING_NONE" "0")
-!     '("error-feedback" "NOISE_SHAPING_ERROR_FEEDBACK" "1")
-!     '("simple" "NOISE_SHAPING_SIMPLE" "2")
-!     '("medium" "NOISE_SHAPING_MEDIUM" "3")
-!     '("high" "NOISE_SHAPING_HIGH" "4")
-    )
-  )
-  
---- 1934,1944 ----
-    (in-module "Gst")
-    (c-name "GstAudioConvertNoiseShaping")
-    (values
-!     '("none" "GST_AUDIO_CONVERT_NOISE_SHAPING_NONE" "0")
-!     '("error-feedback" "GST_AUDIO_CONVERT_NOISE_SHAPING_ERROR_FEEDBACK" "1")
-!     '("simple" "GST_AUDIO_CONVERT_NOISE_SHAPING_SIMPLE" "2")
-!     '("medium" "GST_AUDIO_CONVERT_NOISE_SHAPING_MEDIUM" "3")
-!     '("high" "GST_AUDIO_CONVERT_NOISE_SHAPING_HIGH" "4")
-    )
-  )
-  
-***************
-*** 2230,2246 ****
-    )
-  )
-  
-- ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/ogg/gstoggmux.h
-- 
-- (define-enum-extended 
--   (in-module "Gst")
--   (c-name "")
--   (values
--     '("control" "GST_OGG_PAD_STATE_CONTROL" "0")
--     '("data" "GST_OGG_PAD_STATE_DATA" "1")
--   )
-- )
-- 
-  ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/pango/gsttextoverlay.h
-  
-  (define-enum-extended TextOverlayVAlign
---- 2261,2266 ----
-***************
-*** 2268,2276 ****
-    (c-name "GstTextOverlayWrapMode")
-    (values
-      '("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
-!     '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "#error")
-!     '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "#error")
-!     '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "#error")
-    )
-  )
-  
---- 2288,2296 ----
-    (c-name "GstTextOverlayWrapMode")
-    (values
-      '("none" "GST_TEXT_OVERLAY_WRAP_MODE_NONE" "-1")
-!     '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "0")
-!     '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "1")
-!     '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "2")
-    )
-  )
-  
-***************
-*** 2278,2286 ****
-    (in-module "Gst")
-    (c-name "GstTextOverlayLineAlign")
-    (values
-!     '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "#error")
-!     '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "#error")
-!     '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "#error")
-    )
-  )
-  
---- 2298,2306 ----
-    (in-module "Gst")
-    (c-name "GstTextOverlayLineAlign")
-    (values
-!     '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "0")
-!     '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "1")
-!     '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "2")
-    )
-  )
-  
-***************
-*** 2310,2330 ****
-    (in-module "Gst")
-    (c-name "GstTextRenderLineAlign")
-    (values
-!     '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "#error")
-!     '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "#error")
-!     '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "#error")
-    )
-  )
-  
-  ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
-  
-! (define-enum-extended 
-    (in-module "Gst")
-!   (c-name "")
-    (values
-!     '("none" "BORDER_NONE" "0")
-!     '("black" "BORDER_BLACK" "1")
-!     '("mirror" "BORDER_MIRROR" "2")
-    )
-  )
-  
---- 2330,2375 ----
-    (in-module "Gst")
-    (c-name "GstTextRenderLineAlign")
-    (values
-!     '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "0")
-!     '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "1")
-!     '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "2")
-    )
-  )
-  
-  ;; From /usr/src/jhbuild-sources/gst-plugins-base/ext/theora/gsttheoraenc.h
-  
-! (define-enum-extended TheoraEncBorderMode
-    (in-module "Gst")
-!   (c-name "GstTheoraEncBorderMode")
-    (values
-!     '("none" "GST_THEORA_ENC_BORDER_NONE" "0")
-!     '("black" "GST_THEORA_ENC_BORDER_BLACK" "1")
-!     '("mirror" "GST_THEORA_ENC_BORDER_MIRROR" "2")
-    )
-  )
-  
-+ ;; Handwritten for CdParanoiaSrc plugin (values taken from output of
-+ ;; `gst-inspect cdparanoiasrc' -- "paranoia-mode" property information)
-+ (define-enum-extended GstCdParanoiaSrc
-+   (in-module "Gst")
-+   (c-name "GstCdParanoiaMode")
-+   (values
-+     '("disable" "GST_PARANOIA_MODE_DISABLE" "1<<0")
-+     '("fragment" "GST_PARANOIA_MODE_FRAGMENT" "1<<1")
-+     '("overlap" "GST_PARANOIA_MODE_OVERLAP" "1<<2")
-+     '("scratch" "GST_PARANOIA_MODE_SCRATCH" "1<<3")
-+     '("repair" "GST_PARANOIA_MODE_REPAIR" "1<<4")
-+     '("full" "GST_PARANOIA_MODE_FULL" "0xff")
-+   )
-+ )
-+ 
-+ ;; Handwritten for MultiFdSink plugin (taken from gstmultifdsink.c):
-+ (define-enum-extended FDSetMode
-+   (in-module "Gst")
-+   (c-name "GstFDSetMode")
-+   (values
-+     '("select" "GST_FD_SET_MODE_SELECT" "0")
-+     '("poll" "GST_FD_SET_MODE_POLL" "1")
-+     '("epoll" "GST_FD_SET_MODE_EPOLL" "2")
-+   )
-+ )
+0a1,2
+> ;; Apply gst_enums.defs.patch after regenerating.
+> 
+16c18,27
+<     '("y" "GST_BUFFER_FLAG_READONLY" "#error")
+---
+>     '("readonly" "GST_BUFFER_FLAG_READONLY" "GST_MINI_OBJECT_FLAG_READONLY")
+>     '("preroll" "GST_BUFFER_FLAG_PREROLL" "GST_MINI_OBJECT_FLAG_LAST << 0")
+>     '("discont" "GST_BUFFER_FLAG_DISCONT" "GST_MINI_OBJECT_FLAG_LAST << 1")
+>     '("in-caps" "GST_BUFFER_FLAG_IN_CAPS" "GST_MINI_OBJECT_FLAG_LAST << 2")
+>     '("gap" "GST_BUFFER_FLAG_GAP" "GST_MINI_OBJECT_FLAG_LAST << 3")
+>     '("delta-unit" "GST_BUFFER_FLAG_DELTA_UNIT" "GST_MINI_OBJECT_FLAG_LAST << 4")
+>     '("media1" "GST_BUFFER_FLAG_MEDIA1" "GST_MINI_OBJECT_FLAG_LAST << 5")
+>     '("media2" "GST_BUFFER_FLAG_MEDIA2" "GST_MINI_OBJECT_FLAG_LAST << 6")
+>     '("media3" "GST_BUFFER_FLAG_MEDIA3" "GST_MINI_OBJECT_FLAG_LAST << 7")
+>     '("last" "GST_BUFFER_FLAG_LAST" "GST_MINI_OBJECT_FLAG_LAST << 8")
+47a59,60
+>     '("flushing" "GST_BUS_FLUSHING" "GST_OBJECT_FLAG_LAST << 0")
+>     '("last" "GST_BUS_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 1")
+99a113,119
+>     '("can-do-single-sync" "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC" "GST_OBJECT_FLAG_LAST << 0")
+>     '("can-do-single-async" "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC" "GST_OBJECT_FLAG_LAST << 1")
+>     '("can-do-periodic-sync" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC" "GST_OBJECT_FLAG_LAST << 2")
+>     '("can-do-periodic-async" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC" "GST_OBJECT_FLAG_LAST << 3")
+>     '("can-set-resolution" "GST_CLOCK_FLAG_CAN_SET_RESOLUTION" "GST_OBJECT_FLAG_LAST << 4")
+>     '("can-set-master" "GST_CLOCK_FLAG_CAN_SET_MASTER" "GST_OBJECT_FLAG_LAST << 5")
+>     '("last" "GST_CLOCK_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
+140a161,162
+> ;; TODO: See why gmmproc reports errors when values of following enum are
+> ;; commented in.
+144a167,172
+> ;;    '("null-to-ready" "GST_STATE_CHANGE_NULL_TO_READY" "(GST_STATE_NULL<<3) | GST_STATE_READY")
+> ;;    '("ready-to-paused" "GST_STATE_CHANGE_READY_TO_PAUSED" "(GST_STATE_READY<<3) | GST_STATE_PAUSED")
+> ;;    '("paused-to-playing" "GST_STATE_CHANGE_PAUSED_TO_PLAYING" "(GST_STATE_PAUSED<<3) | GST_STATE_PLAYING")
+> ;;    '("playing-to-paused" "GST_STATE_CHANGE_PLAYING_TO_PAUSED" "(GST_STATE_PLAYING<<3) | GST_STATE_PAUSED")
+> ;;    '("paused-to-ready" "GST_STATE_CHANGE_PAUSED_TO_READY" "(GST_STATE_PAUSED<<3) | GST_STATE_READY")
+> ;;    '("ready-to-null" "GST_STATE_CHANGE_READY_TO_NULL" "(GST_STATE_READY<<3) | GST_STATE_NULL")
+151a180,183
+>     '("locked-state" "GST_ELEMENT_LOCKED_STATE" "GST_OBJECT_FLAG_LAST << 0")
+>     '("is-sink" "GST_ELEMENT_IS_SINK" "GST_OBJECT_FLAG_LAST << 1")
+>     '("unparenting" "GST_ELEMENT_UNPARENTING" "GST_OBJECT_FLAG_LAST << 2")
+>     '("flag-set" "GST_ELEMENT_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 16")
+248,281d279
+< (define-enum-extended EventType
+<   (in-module "Gst")
+<   (c-name "GstEventType")
+<   (values
+<     '("gst-event-unknown" "GST_EVENT_UNKNOWN" "#error")
+<     '("0)" "0)" "1")
+<     '("gst-event-flush-start" "GST_EVENT_FLUSH_START" "2")
+<     '("flag(both))" "FLAG(BOTH))" "3")
+<     '("gst-event-flush-stop" "GST_EVENT_FLUSH_STOP" "4")
+<     '("gst-event-eos" "GST_EVENT_EOS" "6")
+<     '("gst-event-newsegment" "GST_EVENT_NEWSEGMENT" "8")
+<     '("gst-event-tag" "GST_EVENT_TAG" "10")
+<     '("gst-event-buffersize" "GST_EVENT_BUFFERSIZE" "12")
+<     '("gst-event-qos" "GST_EVENT_QOS" "14")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "15")
+<     '("gst-event-seek" "GST_EVENT_SEEK" "16")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "17")
+<     '("gst-event-navigation" "GST_EVENT_NAVIGATION" "18")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "19")
+<     '("gst-event-latency" "GST_EVENT_LATENCY" "20")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "21")
+<     '("gst-event-step" "GST_EVENT_STEP" "22")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "23")
+<     '("gst-event-custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "24")
+<     '("flag(upstream))" "FLAG(UPSTREAM))" "25")
+<     '("gst-event-custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "26")
+<     '("gst-event-custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "28")
+<     '("flag(downstream))" "FLAG(DOWNSTREAM))" "29")
+<     '("gst-event-custom-both" "GST_EVENT_CUSTOM_BOTH" "30")
+<     '("gst-event-custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "32")
+<     '("flag(both))" "FLAG(BOTH))" "33")
+<   )
+< )
+< 
+378a377,379
+>     '("writable" "GST_INDEX_WRITABLE" "GST_OBJECT_FLAG_LAST << 0")
+>     '("readable" "GST_INDEX_READABLE" "GST_OBJECT_FLAG_LAST << 1")
+>     '("last" "GST_INDEX_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
+479c480
+<     '("any" "GST_MESSAGE_ANY" "0xFFFFFFFFFFFFFFFF")
+---
+>     '("any" "GST_MESSAGE_ANY" "~0")
+585a587,592
+>     '("blocked" "GST_PAD_BLOCKED" "GST_OBJECT_FLAG_LAST << 0")
+>     '("flushing" "GST_PAD_FLUSHING" "GST_OBJECT_FLAG_LAST << 1")
+>     '("in-getcaps" "GST_PAD_IN_GETCAPS" "GST_OBJECT_FLAG_LAST << 2")
+>     '("in_setcaps" "GST_PAD_IN_SETCAPS" "GST_OBJECT_FLAG_LAST << 3")
+>     '("blocking" "GST_PAD_BLOCKING" "GST_OBJECT_FLAG_LAST << 4")
+>     '("last" "GST_PAD_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
+604a612,613
+>     '("fixed" "GST_PAD_TEMPLATE_FIXED" "GST_OBJECT_FLAG_LAST << 0")
+>     '("last" "GST_PAD_TEMPLATE_LAST" "GST_OBJECT_FLAG_LAST << 4")
+997,1003c1006,1012
+<     '("none" "FAKE_SINK_STATE_ERROR_NONE" "0")
+<     '("null-ready" "FAKE_SINK_STATE_ERROR_NULL_READY" "1")
+<     '("ready-paused" "FAKE_SINK_STATE_ERROR_READY_PAUSED" "2")
+<     '("paused-playing" "FAKE_SINK_STATE_ERROR_PAUSED_PLAYING" "3")
+<     '("playing-paused" "FAKE_SINK_STATE_ERROR_PLAYING_PAUSED" "4")
+<     '("paused-ready" "FAKE_SINK_STATE_ERROR_PAUSED_READY" "5")
+<     '("ready-null" "FAKE_SINK_STATE_ERROR_READY_NULL" "6")
+---
+>     '("none" "GST_FAKE_SINK_STATE_ERROR_NONE" "0")
+>     '("null-ready" "GST_FAKE_SINK_STATE_ERROR_NULL_READY" "1")
+>     '("ready-paused" "GST_FAKE_SINK_STATE_ERROR_READY_PAUSED" "2")
+>     '("paused-playing" "GST_FAKE_SINK_STATE_ERROR_PAUSED_PLAYING" "3")
+>     '("playing-paused" "GST_FAKE_SINK_STATE_ERROR_PLAYING_PAUSED" "4")
+>     '("paused-ready" "GST_FAKE_SINK_STATE_ERROR_PAUSED_READY" "5")
+>     '("ready-null" "GST_FAKE_SINK_STATE_ERROR_READY_NULL" "6")
+1013,1020c1022,1029
+<     '("first-last-loop" "FAKE_SRC_FIRST_LAST_LOOP" "1")
+<     '("last-first-loop" "FAKE_SRC_LAST_FIRST_LOOP" "2")
+<     '("ping-pong" "FAKE_SRC_PING_PONG" "3")
+<     '("ordered-random" "FAKE_SRC_ORDERED_RANDOM" "4")
+<     '("random" "FAKE_SRC_RANDOM" "5")
+<     '("pattern-loop" "FAKE_SRC_PATTERN_LOOP" "6")
+<     '("ping-pong-pattern" "FAKE_SRC_PING_PONG_PATTERN" "7")
+<     '("get-always-suceeds" "FAKE_SRC_GET_ALWAYS_SUCEEDS" "8")
+---
+>     '("first-last-loop" "GST_FAKE_SRC_FIRST_LAST_LOOP" "1")
+>     '("last-first-loop" "GST_FAKE_SRC_LAST_FIRST_LOOP" "2")
+>     '("ping-pong" "GST_FAKE_SRC_PING_PONG" "3")
+>     '("ordered-random" "GST_FAKE_SRC_ORDERED_RANDOM" "4")
+>     '("random" "GST_FAKE_SRC_RANDOM" "5")
+>     '("pattern-loop" "GST_FAKE_SRC_PATTERN_LOOP" "6")
+>     '("ping-pong-pattern" "GST_FAKE_SRC_PING_PONG_PATTERN" "7")
+>     '("get-always-suceeds" "GST_FAKE_SRC_GET_ALWAYS_SUCEEDS" "8")
+1028,1029c1037,1038
+<     '("allocate" "FAKE_SRC_DATA_ALLOCATE" "1")
+<     '("subbuffer" "FAKE_SRC_DATA_SUBBUFFER" "2")
+---
+>     '("allocate" "GST_FAKE_SRC_DATA_ALLOCATE" "1")
+>     '("subbuffer" "GST_FAKE_SRC_DATA_SUBBUFFER" "2")
+1037,1039c1046,1048
+<     '("empty" "FAKE_SRC_SIZETYPE_EMPTY" "1")
+<     '("fixed" "FAKE_SRC_SIZETYPE_FIXED" "2")
+<     '("random" "FAKE_SRC_SIZETYPE_RANDOM" "3")
+---
+>     '("empty" "GST_FAKE_SRC_SIZETYPE_EMPTY" "1")
+>     '("fixed" "GST_FAKE_SRC_SIZETYPE_FIXED" "2")
+>     '("random" "GST_FAKE_SRC_SIZETYPE_RANDOM" "3")
+1047,1051c1056,1072
+<     '("nothing" "FAKE_SRC_FILLTYPE_NOTHING" "1")
+<     '("zero" "FAKE_SRC_FILLTYPE_ZERO" "2")
+<     '("random" "FAKE_SRC_FILLTYPE_RANDOM" "3")
+<     '("pattern" "FAKE_SRC_FILLTYPE_PATTERN" "4")
+<     '("pattern-cont" "FAKE_SRC_FILLTYPE_PATTERN_CONT" "5")
+---
+>     '("nothing" "GST_FAKE_SRC_FILLTYPE_NOTHING" "1")
+>     '("zero" "GST_FAKE_SRC_FILLTYPE_ZERO" "2")
+>     '("random" "GST_FAKE_SRC_FILLTYPE_RANDOM" "3")
+>     '("pattern" "GST_FAKE_SRC_FILLTYPE_PATTERN" "4")
+>     '("pattern-cont" "GST_FAKE_SRC_FILLTYPE_PATTERN_CONT" "5")
+>   )
+> )
+> 
+> ;; Handwritten for the filesink plug-in (Gst::FileSink).
+> (define-enum-extended FileSinkBufferMode
+>   (in-module "Gst")
+>   (c-name "GstFileSinkBufferMode")
+>   (values
+>     '("default" "GST_FILE_SINK_BUFFER_MODE_DEFAULT" "-1")
+>     '("full" "GST_FILE_SINK_BUFFER_MODE_FULL" "0")
+>     '("line" "GST_FILE_SINK_BUFFER_MODE_LINE" "1")
+>     '("unbuffered" "GST_FILE_SINK_BUFFER_MODE_UNBUFFERED" "2")
+1077a1099,1109
+> ;; Handwritten for the queue plug-in (Gst::Queue).
+> (define-enum-extended QueueLeaky
+>   (in-module "Gst")
+>   (c-name "GstQueueLeaky")
+>   (values
+>     '("no" "GST_QUEUE_LEAKY_NONE" "0")
+>     '("upstream" "GST_QUEUE_LEAKY_UPSTREAM" "1")
+>     '("downstream" "GST_QUEUE_LEAKY_DOWNSTREAM" "2")
+>   )
+> )
+> 
+1920,1923c1952,1955
+<     '("none" "DITHER_NONE" "0")
+<     '("rpdf" "DITHER_RPDF" "1")
+<     '("tpdf" "DITHER_TPDF" "2")
+<     '("tpdf-hf" "DITHER_TPDF_HF" "3")
+---
+>     '("none" "GST_AUDIO_CONVERT_DITHER_NONE" "0")
+>     '("rpdf" "GST_AUDIO_CONVERT_DITHER_RPDF" "1")
+>     '("tpdf" "GST_AUDIO_CONVERT_DITHER_TPDF" "2")
+>     '("tpdf-hf" "GST_AUDIO_CONVERT_DITHER_TPDF_HF" "3")
+1931,1935c1963,1967
+<     '("none" "NOISE_SHAPING_NONE" "0")
+<     '("error-feedback" "NOISE_SHAPING_ERROR_FEEDBACK" "1")
+<     '("simple" "NOISE_SHAPING_SIMPLE" "2")
+<     '("medium" "NOISE_SHAPING_MEDIUM" "3")
+<     '("high" "NOISE_SHAPING_HIGH" "4")
+---
+>     '("none" "GST_AUDIO_CONVERT_NOISE_SHAPING_NONE" "0")
+>     '("error-feedback" "GST_AUDIO_CONVERT_NOISE_SHAPING_ERROR_FEEDBACK" "1")
+>     '("simple" "GST_AUDIO_CONVERT_NOISE_SHAPING_SIMPLE" "2")
+>     '("medium" "GST_AUDIO_CONVERT_NOISE_SHAPING_MEDIUM" "3")
+>     '("high" "GST_AUDIO_CONVERT_NOISE_SHAPING_HIGH" "4")
+2260,2268d2291
+< (define-enum-extended 
+<   (in-module "Gst")
+<   (c-name "")
+<   (values
+<     '("control" "GST_OGG_PAD_STATE_CONTROL" "0")
+<     '("data" "GST_OGG_PAD_STATE_DATA" "1")
+<   )
+< )
+< 
+2296,2298c2319,2321
+<     '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "#error")
+<     '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "#error")
+<     '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "#error")
+---
+>     '("word" "GST_TEXT_OVERLAY_WRAP_MODE_WORD" "0")
+>     '("char" "GST_TEXT_OVERLAY_WRAP_MODE_CHAR" "1")
+>     '("word-char" "GST_TEXT_OVERLAY_WRAP_MODE_WORD_CHAR" "2")
+2306,2308c2329,2331
+<     '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "#error")
+<     '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "#error")
+<     '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "#error")
+---
+>     '("left" "GST_TEXT_OVERLAY_LINE_ALIGN_LEFT" "0")
+>     '("center" "GST_TEXT_OVERLAY_LINE_ALIGN_CENTER" "1")
+>     '("right" "GST_TEXT_OVERLAY_LINE_ALIGN_RIGHT" "2")
+2338,2340c2361,2363
+<     '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "#error")
+<     '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "#error")
+<     '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "#error")
+---
+>     '("left" "GST_TEXT_RENDER_LINE_ALIGN_LEFT" "0")
+>     '("center" "GST_TEXT_RENDER_LINE_ALIGN_CENTER" "1")
+>     '("right" "GST_TEXT_RENDER_LINE_ALIGN_RIGHT" "2")
+2346c2369
+< (define-enum-extended 
+---
+> (define-enum-extended TheoraEncBorderMode
+2348c2371
+<   (c-name "")
+---
+>   (c-name "GstTheoraEncBorderMode")
+2350,2352c2373,2375
+<     '("none" "BORDER_NONE" "0")
+<     '("black" "BORDER_BLACK" "1")
+<     '("mirror" "BORDER_MIRROR" "2")
+---
+>     '("none" "GST_THEORA_ENC_BORDER_NONE" "0")
+>     '("black" "GST_THEORA_ENC_BORDER_BLACK" "1")
+>     '("mirror" "GST_THEORA_ENC_BORDER_MIRROR" "2")
+2355a2379,2403
+> ;; Handwritten for CdParanoiaSrc plugin (values taken from output of
+> ;; `gst-inspect cdparanoiasrc' -- "paranoia-mode" property information)
+> (define-enum-extended GstCdParanoiaSrc
+>   (in-module "Gst")
+>   (c-name "GstCdParanoiaMode")
+>   (values
+>     '("disable" "GST_PARANOIA_MODE_DISABLE" "1<<0")
+>     '("fragment" "GST_PARANOIA_MODE_FRAGMENT" "1<<1")
+>     '("overlap" "GST_PARANOIA_MODE_OVERLAP" "1<<2")
+>     '("scratch" "GST_PARANOIA_MODE_SCRATCH" "1<<3")
+>     '("repair" "GST_PARANOIA_MODE_REPAIR" "1<<4")
+>     '("full" "GST_PARANOIA_MODE_FULL" "0xff")
+>   )
+> )
+> 
+> ;; Handwritten for MultiFdSink plugin (taken from gstmultifdsink.c):
+> (define-enum-extended FDSetMode
+>   (in-module "Gst")
+>   (c-name "GstFDSetMode")
+>   (values
+>     '("select" "GST_FD_SET_MODE_SELECT" "0")
+>     '("poll" "GST_FD_SET_MODE_POLL" "1")
+>     '("epoll" "GST_FD_SET_MODE_EPOLL" "2")
+>   )
+> )
diff --git a/gstreamer/src/gst_methods.defs b/gstreamer/src/gst_methods.defs
index f3fc2b3..771940f 100644
--- a/gstreamer/src/gst_methods.defs
+++ b/gstreamer/src/gst_methods.defs
@@ -1911,6 +1911,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")
@@ -4224,6 +4233,17 @@
   )
 )
 
+(define-function gst_iterator_new_single
+  (c-name "gst_iterator_new_single")
+  (return-type "GstIterator*")
+  (parameters
+    '("GType" "type")
+    '("gpointer" "object")
+    '("GstCopyFunction" "copy")
+    '("GFreeFunc" "free")
+  )
+)
+
 (define-method next
   (of-object "GstIterator")
   (c-name "gst_iterator_next")
@@ -9000,6 +9020,26 @@
   )
 )
 
+(define-function gst_util_uint64_scale_round
+  (c-name "gst_util_uint64_scale_round")
+  (return-type "guint64")
+  (parameters
+    '("guint64" "val")
+    '("guint64" "num")
+    '("guint64" "denom")
+  )
+)
+
+(define-function gst_util_uint64_scale_ceil
+  (c-name "gst_util_uint64_scale_ceil")
+  (return-type "guint64")
+  (parameters
+    '("guint64" "val")
+    '("guint64" "num")
+    '("guint64" "denom")
+  )
+)
+
 (define-function gst_util_uint64_scale_int
   (c-name "gst_util_uint64_scale_int")
   (return-type "guint64")
@@ -9010,6 +9050,26 @@
   )
 )
 
+(define-function gst_util_uint64_scale_int_round
+  (c-name "gst_util_uint64_scale_int_round")
+  (return-type "guint64")
+  (parameters
+    '("guint64" "val")
+    '("gint" "num")
+    '("gint" "denom")
+  )
+)
+
+(define-function gst_util_uint64_scale_int_ceil
+  (c-name "gst_util_uint64_scale_int_ceil")
+  (return-type "guint64")
+  (parameters
+    '("guint64" "val")
+    '("gint" "num")
+    '("gint" "denom")
+  )
+)
+
 (define-function gst_util_seqnum_next
   (c-name "gst_util_seqnum_next")
   (return-type "guint32")
@@ -10763,6 +10823,307 @@
 
 
 
+;; From gstbytereader-docs.h
+
+(define-method skip_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_skip_unchecked")
+  (return-type "none")
+  (parameters
+    '("guint" "nbytes")
+  )
+)
+
+(define-method get_uint8_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint8_unchecked")
+  (return-type "guint8")
+)
+
+(define-method peek_uint8_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint8_unchecked")
+  (return-type "guint8")
+)
+
+(define-method get_int8_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int8_unchecked")
+  (return-type "gint8")
+)
+
+(define-method peek_int8_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int8_unchecked")
+  (return-type "gint8")
+)
+
+(define-method get_uint16_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint16_le_unchecked")
+  (return-type "guint16")
+)
+
+(define-method get_uint16_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint16_be_unchecked")
+  (return-type "guint16")
+)
+
+(define-method peek_uint16_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint16_le_unchecked")
+  (return-type "guint16")
+)
+
+(define-method peek_uint16_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint16_be_unchecked")
+  (return-type "guint16")
+)
+
+(define-method get_int16_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int16_le_unchecked")
+  (return-type "gint16")
+)
+
+(define-method get_int16_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int16_be_unchecked")
+  (return-type "gint16")
+)
+
+(define-method peek_int16_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int16_le_unchecked")
+  (return-type "gint16")
+)
+
+(define-method peek_int16_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int16_be_unchecked")
+  (return-type "gint16")
+)
+
+(define-method get_uint24_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint24_le_unchecked")
+  (return-type "guint32")
+)
+
+(define-method get_uint24_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint24_be_unchecked")
+  (return-type "guint32")
+)
+
+(define-method peek_uint24_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint24_le_unchecked")
+  (return-type "guint32")
+)
+
+(define-method peek_uint24_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint24_be_unchecked")
+  (return-type "guint32")
+)
+
+(define-method get_int24_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int24_le_unchecked")
+  (return-type "gint32")
+)
+
+(define-method get_int24_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int24_be_unchecked")
+  (return-type "gint32")
+)
+
+(define-method peek_int24_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int24_le_unchecked")
+  (return-type "gint32")
+)
+
+(define-method peek_int24_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int24_be_unchecked")
+  (return-type "gint32")
+)
+
+(define-method get_uint32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint32_le_unchecked")
+  (return-type "guint32")
+)
+
+(define-method get_uint32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint32_be_unchecked")
+  (return-type "guint32")
+)
+
+(define-method peek_uint32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint32_le_unchecked")
+  (return-type "guint32")
+)
+
+(define-method peek_uint32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint32_be_unchecked")
+  (return-type "guint32")
+)
+
+(define-method get_int32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int32_le_unchecked")
+  (return-type "gint32")
+)
+
+(define-method get_int32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int32_be_unchecked")
+  (return-type "gint32")
+)
+
+(define-method peek_int32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int32_le_unchecked")
+  (return-type "gint32")
+)
+
+(define-method peek_int32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int32_be_unchecked")
+  (return-type "gint32")
+)
+
+(define-method get_uint64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint64_le_unchecked")
+  (return-type "guint64")
+)
+
+(define-method get_uint64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_uint64_be_unchecked")
+  (return-type "guint64")
+)
+
+(define-method peek_uint64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint64_le_unchecked")
+  (return-type "guint64")
+)
+
+(define-method peek_uint64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_uint64_be_unchecked")
+  (return-type "guint64")
+)
+
+(define-method get_int64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int64_le_unchecked")
+  (return-type "gint64")
+)
+
+(define-method get_int64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_int64_be_unchecked")
+  (return-type "gint64")
+)
+
+(define-method peek_int64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int64_le_unchecked")
+  (return-type "gint64")
+)
+
+(define-method peek_int64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_int64_be_unchecked")
+  (return-type "gint64")
+)
+
+(define-method get_float32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_float32_le_unchecked")
+  (return-type "gfloat")
+)
+
+(define-method get_float32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_float32_be_unchecked")
+  (return-type "gfloat")
+)
+
+(define-method get_float64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_float64_le_unchecked")
+  (return-type "gdouble")
+)
+
+(define-method get_float64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_float64_be_unchecked")
+  (return-type "gdouble")
+)
+
+(define-method peek_float32_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_float32_le_unchecked")
+  (return-type "gfloat")
+)
+
+(define-method peek_float32_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_float32_be_unchecked")
+  (return-type "gfloat")
+)
+
+(define-method peek_float64_le_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_float64_le_unchecked")
+  (return-type "gdouble")
+)
+
+(define-method peek_float64_be_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_float64_be_unchecked")
+  (return-type "gdouble")
+)
+
+(define-method peek_data_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_peek_data_unchecked")
+  (return-type "const-guint8*")
+)
+
+(define-method get_data_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_get_data_unchecked")
+  (return-type "const-guint8*")
+  (parameters
+    '("guint" "size")
+  )
+)
+
+(define-method dup_data_unchecked
+  (of-object "GstByteReader")
+  (c-name "gst_byte_reader_dup_data_unchecked")
+  (return-type "guint8*")
+  (parameters
+    '("guint" "size")
+  )
+)
+
+
+
 ;; From gstbytereader.h
 
 (define-function gst_byte_reader_new
@@ -12589,6 +12950,10 @@
 )
 
 
+
+;; From internal-check.h
+
+
 ;; -*- scheme -*-
 ; object definitions ...
 (define-object AppBuffer
@@ -13023,6 +13388,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")
   )
 )
 
@@ -13087,6 +13454,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")
@@ -13260,6 +13638,7 @@
   (values
     '("invalid" "GST_RTSP_VERSION_INVALID")
     '("1-0" "GST_RTSP_VERSION_1_0")
+    '("1-1" "GST_RTSP_VERSION_1_1")
   )
 )
 
@@ -13280,6 +13659,8 @@
     '("setup" "GST_RTSP_SETUP")
     '("set-parameter" "GST_RTSP_SET_PARAMETER")
     '("teardown" "GST_RTSP_TEARDOWN")
+    '("get" "GST_RTSP_GET")
+    '("post" "GST_RTSP_POST")
   )
 )
 
@@ -13375,6 +13756,12 @@
     '("x-rtp-info" "GST_RTSP_HDR_X_RTP_INFO")
     '("x-startupprofile" "GST_RTSP_HDR_X_STARTUPPROFILE")
     '("timestamp" "GST_RTSP_HDR_TIMESTAMP")
+    '("authentication-info" "GST_RTSP_HDR_AUTHENTICATION_INFO")
+    '("host" "GST_RTSP_HDR_HOST")
+    '("pragma" "GST_RTSP_HDR_PRAGMA")
+    '("x-server-ip-address" "GST_RTSP_HDR_X_SERVER_IP_ADDRESS")
+    '("x-sessioncookie" "GST_RTSP_HDR_X_SESSIONCOOKIE")
+    '("last" "GST_RTSP_HDR_LAST")
   )
 )
 
@@ -13439,6 +13826,8 @@
     '("invalid" "GST_RTSP_MESSAGE_INVALID")
     '("request" "GST_RTSP_MESSAGE_REQUEST")
     '("response" "GST_RTSP_MESSAGE_RESPONSE")
+    '("http-request" "GST_RTSP_MESSAGE_HTTP_REQUEST")
+    '("http-response" "GST_RTSP_MESSAGE_HTTP_RESPONSE")
     '("data" "GST_RTSP_MESSAGE_DATA")
   )
 )
@@ -15136,6 +15525,11 @@
   (return-type "GType")
 )
 
+(define-function gst_stream_volume_format_get_type
+  (c-name "gst_stream_volume_format_get_type")
+  (return-type "GType")
+)
+
 (define-function gst_tuner_channel_flags_get_type
   (c-name "gst_tuner_channel_flags_get_type")
   (return-type "GType")
@@ -15693,6 +16087,59 @@
 
 
 
+;; From streamvolume.h
+
+(define-function gst_stream_volume_get_type
+  (c-name "gst_stream_volume_get_type")
+  (return-type "GType")
+)
+
+(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 gst_stream_volume_convert_volume
+  (c-name "gst_stream_volume_convert_volume")
+  (return-type "gdouble")
+  (parameters
+    '("GstStreamVolumeFormat" "from")
+    '("GstStreamVolumeFormat" "to")
+    '("gdouble" "val")
+  )
+)
+
+
+
 ;; From tunerchannel.h
 
 (define-function gst_tuner_channel_get_type
@@ -16247,12 +16694,6 @@
   (return-type "none")
 )
 
-(define-method set_sample_based
-  (of-object "GstBaseRTPAudioPayload")
-  (c-name "gst_base_rtp_audio_payload_set_sample_based")
-  (return-type "none")
-)
-
 (define-method set_frame_options
   (of-object "GstBaseRTPAudioPayload")
   (c-name "gst_base_rtp_audio_payload_set_frame_options")
@@ -16263,6 +16704,12 @@
   )
 )
 
+(define-method set_sample_based
+  (of-object "GstBaseRTPAudioPayload")
+  (c-name "gst_base_rtp_audio_payload_set_sample_based")
+  (return-type "none")
+)
+
 (define-method set_sample_options
   (of-object "GstBaseRTPAudioPayload")
   (c-name "gst_base_rtp_audio_payload_set_sample_options")
@@ -16281,6 +16728,12 @@
   )
 )
 
+(define-method get_adapter
+  (of-object "GstBaseRTPAudioPayload")
+  (c-name "gst_base_rtp_audio_payload_get_adapter")
+  (return-type "GstAdapter*")
+)
+
 (define-method push
   (of-object "GstBaseRTPAudioPayload")
   (c-name "gst_base_rtp_audio_payload_push")
@@ -16292,10 +16745,14 @@
   )
 )
 
-(define-method get_adapter
+(define-method flush
   (of-object "GstBaseRTPAudioPayload")
-  (c-name "gst_base_rtp_audio_payload_get_adapter")
-  (return-type "GstAdapter*")
+  (c-name "gst_base_rtp_audio_payload_flush")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("guint" "payload_len")
+    '("GstClockTime" "timestamp")
+  )
 )
 
 
@@ -17308,6 +17765,18 @@
   )
 )
 
+(define-function gst_rtsp_connection_create_from_fd
+  (c-name "gst_rtsp_connection_create_from_fd")
+  (return-type "GstRTSPResult")
+  (parameters
+    '("gint" "fd")
+    '("const-gchar*" "ip")
+    '("guint16" "port")
+    '("const-gchar*" "initial_buffer")
+    '("GstRTSPConnection**" "conn")
+  )
+)
+
 (define-function gst_rtsp_connection_accept
   (c-name "gst_rtsp_connection_accept")
   (return-type "GstRTSPResult")
@@ -17494,6 +17963,15 @@
   (return-type "gint")
 )
 
+(define-method set_http_mode
+  (of-object "GstRTSPConnection")
+  (c-name "gst_rtsp_connection_set_http_mode")
+  (return-type "none")
+  (parameters
+    '("gboolean" "enable")
+  )
+)
+
 (define-method set_tunneled
   (of-object "GstRTSPConnection")
   (c-name "gst_rtsp_connection_set_tunneled")
@@ -17557,6 +18035,27 @@
   )
 )
 
+(define-method write_data
+  (of-object "GstRTSPWatch")
+  (c-name "gst_rtsp_watch_write_data")
+  (return-type "GstRTSPResult")
+  (parameters
+    '("const-guint8*" "data")
+    '("guint" "size")
+    '("guint*" "id")
+  )
+)
+
+(define-method send_message
+  (of-object "GstRTSPWatch")
+  (c-name "gst_rtsp_watch_send_message")
+  (return-type "GstRTSPResult")
+  (parameters
+    '("GstRTSPMessage*" "message")
+    '("guint*" "id")
+  )
+)
+
 (define-method queue_data
   (of-object "GstRTSPWatch")
   (c-name "gst_rtsp_watch_queue_data")
@@ -17640,6 +18139,14 @@
   )
 )
 
+(define-function gst_rtsp_header_allow_multiple
+  (c-name "gst_rtsp_header_allow_multiple")
+  (return-type "gboolean")
+  (parameters
+    '("GstRTSPHeaderField" "field")
+  )
+)
+
 
 
 ;; From gstrtsp-enumtypes.h
@@ -18162,10 +18669,6 @@
 
 
 
-;; From md5.h
-
-
-
 ;; From rtsp-marshal.h
 
 
diff --git a/gstreamer/src/gst_signals.defs b/gstreamer/src/gst_signals.defs
index 8afc40f..2ef9bf3 100644
--- a/gstreamer/src/gst_signals.defs
+++ b/gstreamer/src/gst_signals.defs
@@ -1965,6 +1965,15 @@
   (construct-only #f)
 )
 
+(define-property append
+  (of-object "GstFileSink")
+  (prop-type "GParamBoolean")
+  (docs "Append to an already existing file")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstIdentity
 
 (define-signal handoff
@@ -3175,6 +3184,15 @@
   (construct-only #f)
 )
 
+(define-property perfect-rtptime
+  (of-object "GstBaseRTPAudioPayload")
+  (prop-type "GParamBoolean")
+  (docs "Generate perfect RTP timestamps when possible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstBaseRTPDepayload
 
 (define-property name
@@ -3287,6 +3305,15 @@
   (construct-only #f)
 )
 
+(define-property perfect-rtptime
+  (of-object "GstBaseRTPPayload")
+  (prop-type "GParamBoolean")
+  (docs "Generate perfect RTP timestamps when possible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstTagDemux
 
 (define-property name
@@ -3390,6 +3417,15 @@
   (construct-only #f)
 )
 
+(define-property show-preroll-frame
+  (of-object "GstVideoSink")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render video frames during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstVideoFilter
 
 (define-property name
@@ -3618,6 +3654,26 @@
   )
 )
 
+;; From GstStreamVolume
+
+(define-property mute
+  (of-object "GstStreamVolume")
+  (prop-type "GParamBoolean")
+  (docs "Mute the audio channel without changing the volume")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "GstStreamVolume")
+  (prop-type "GParamDouble")
+  (docs "Linear volume factor, 1.0=100%")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstTuner
 
 (define-signal frequency-changed
@@ -4840,6 +4896,24 @@
   (construct-only #f)
 )
 
+(define-property auto-resize
+  (of-object "GstClockOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Automatically adjust font size to screen-size.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vertical-render
+  (of-object "GstClockOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Vertical Render.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property time-format
   (of-object "GstClockOverlay")
   (prop-type "GParamString")
@@ -7382,6 +7456,24 @@
   (construct-only #f)
 )
 
+(define-property auto-resize
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Automatically adjust font size to screen-size.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vertical-render
+  (of-object "GstTextOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Vertical Render.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstTextRender
 
 (define-property name
@@ -7761,6 +7853,24 @@
   (construct-only #f)
 )
 
+(define-property auto-resize
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Automatically adjust font size to screen-size.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vertical-render
+  (of-object "GstTimeOverlay")
+  (prop-type "GParamBoolean")
+  (docs "Vertical Render.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstURIDecodeBin
 
 (define-signal unknown-type
@@ -7876,7 +7986,7 @@
 (define-property buffer-size
   (of-object "GstURIDecodeBin")
   (prop-type "GParamInt")
-  (docs "Buffer size when buffering network streams")
+  (docs "Buffer size when buffering network streams (-1 queue2 default value)")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7885,7 +7995,7 @@
 (define-property buffer-duration
   (of-object "GstURIDecodeBin")
   (prop-type "GParamInt64")
-  (docs "Buffer duration when buffering network streams")
+  (docs "Buffer duration when buffering network streams (-1 queue2 default value)")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7965,6 +8075,15 @@
   (construct-only #f)
 )
 
+(define-property skip-to-first
+  (of-object "GstVideoRate")
+  (prop-type "GParamBoolean")
+  (docs "Don't produce buffers before the first one we receive")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GstVideoScale
 
 (define-property name
@@ -8422,6 +8541,15 @@
   (construct-only #f)
 )
 
+(define-property show-preroll-frame
+  (of-object "GstXImageSink")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render video frames during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property display
   (of-object "GstXImageSink")
   (prop-type "GParamString")
@@ -8568,6 +8696,15 @@
   (construct-only #f)
 )
 
+(define-property show-preroll-frame
+  (of-object "GstXvImageSink")
+  (prop-type "GParamBoolean")
+  (docs "Whether to render video frames during preroll")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property contrast
   (of-object "GstXvImageSink")
   (prop-type "GParamInt")
diff --git a/gstreamer/src/streamvolume.ccg b/gstreamer/src/streamvolume.ccg
new file mode 100644
index 0000000..3179454
--- /dev/null
+++ b/gstreamer/src/streamvolume.ccg
@@ -0,0 +1,20 @@
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2009 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/interfaces/interfaces-enumtypes.h>
diff --git a/gstreamer/src/streamvolume.hg b/gstreamer/src/streamvolume.hg
new file mode 100644
index 0000000..daf4f61
--- /dev/null
+++ b/gstreamer/src/streamvolume.hg
@@ -0,0 +1,51 @@
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2009 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/interfaces/streamvolume.h>
+#include <glibmm/interface.h>
+
+_DEFS(gstreamermm,gst)
+
+namespace Gst
+{
+
+_WRAP_ENUM(StreamVolumeFormat, GstStreamVolumeFormat)
+
+/** Gst::StreamVolume - Interface for elements that provide a stream volume.
+ * @ingroup GstInterfaces
+ */
+
+class StreamVolume : public Glib::Interface
+{
+  _CLASS_INTERFACE(StreamVolume, GstStreamVolume, GST_STREAM_VOLUME, GstStreamVolumeInterface)
+
+public:
+  _WRAP_METHOD(double get_volume(Gst::StreamVolumeFormat format), gst_stream_volume_get_volume)
+  _WRAP_METHOD(void set_volume(Gst::StreamVolumeFormat format, double val), gst_stream_volume_set_volume)
+  _WRAP_METHOD(bool get_mute(), gst_stream_volume_get_mute)
+  _WRAP_METHOD(void set_mute(bool mute), gst_stream_volume_set_mute)
+  _WRAP_METHOD(static double convert_volume(Gst::StreamVolumeFormat from, Gst::StreamVolumeFormat to, double val),
+gst_stream_volume_convert_volume)
+
+  // Properties:
+  _WRAP_PROPERTY("mute", bool)
+  _WRAP_PROPERTY("volume", double)
+};
+
+} // namespace Gst
diff --git a/tools/extra_defs_gen/generate_defs_gst.cc b/tools/extra_defs_gen/generate_defs_gst.cc
index 64b9795..8c36685 100644
--- a/tools/extra_defs_gen/generate_defs_gst.cc
+++ b/tools/extra_defs_gen/generate_defs_gst.cc
@@ -60,6 +60,7 @@
 #include <gst/interfaces/mixer.h>
 #include <gst/interfaces/navigation.h>
 #include <gst/interfaces/propertyprobe.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/interfaces/tuner.h>
 #include <gst/interfaces/videoorientation.h>
 #include <gst/interfaces/xoverlay.h>
@@ -166,6 +167,7 @@ int main (int argc, char *argv[])
             << get_defs(GST_TYPE_MIXER_OPTIONS, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_NAVIGATION, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_PROPERTY_PROBE, gst_type_is_a_pointer)
+            << get_defs(GST_TYPE_STREAM_VOLUME, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_TUNER, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_TUNER_CHANNEL, gst_type_is_a_pointer)
             << get_defs(GST_TYPE_TUNER_NORM, gst_type_is_a_pointer)
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index 9e59f19..20b9585 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -33,6 +33,7 @@ _CONV_ENUM(Gst,SeekType)
 _CONV_ENUM(Gst,State)
 _CONV_ENUM(Gst,StateChange)
 _CONV_ENUM(Gst,StateChangeReturn)
+_CONV_ENUM(Gst,StreamVolumeFormat)
 _CONV_ENUM(Gst,TagMergeMode)
 _CONV_ENUM(Gst,TaskState)
 _CONV_ENUM(Gst,TunerChannelFlags)
diff --git a/tools/m4/plugingen_gstreamermm.m4 b/tools/m4/plugingen_gstreamermm.m4
index 0f5a1d7..2a30c29 100644
--- a/tools/m4/plugingen_gstreamermm.m4
+++ b/tools/m4/plugingen_gstreamermm.m4
@@ -32,6 +32,7 @@ _TRANSLATION(`GstMixer*',`Gst::Mixer',`const Glib::RefPtr<Gst::Mixer>&',`Glib::R
 _TRANSLATION(`GstNavigation*',`Gst::Navigation',`const Glib::RefPtr<Gst::Navigation>&',`Glib::RefPtr<Gst::Navigation>',`<gstreamermm/navigation.h>')
 _TRANSLATION(`GstPreset*',`Gst::Preset',`const Glib::RefPtr<Gst::Preset>&',`Glib::RefPtr<Gst::Preset>',`<gstreamermm/preset.h>')
 _TRANSLATION(`GstPropertyProbe*',`Gst::PropertyProbe',`const Glib::RefPtr<Gst::PropertyProbe>&',`Glib::RefPtr<Gst::PropertyProbe>',`<gstreamermm/propertyprobe.h>')
+_TRANSLATION(`GstStreamVolume*',`Gst::StreamVolume',`const Glib::RefPtr<Gst::StreamVolume>&',`Glib::RefPtr<Gst::StreamVolume>',`<gstreamermm/streamvolume.h>')
 _TRANSLATION(`GstTagSetter*',`Gst::TagSetter',`const Glib::RefPtr<Gst::TagSetter>&',`Glib::RefPtr<Gst::TagSetter>',`<gstreamermm/tagsetter.h>')
 _TRANSLATION(`GstURIHandler*',`Gst::URIHandler',`const Glib::RefPtr<Gst::URIHandler>&',`Glib::RefPtr<Gst::URIHandler>',`<gstreamermm/urihandler.h>')
 _TRANSLATION(`GstXOverlay*',`Gst::XOverlay',`const Glib::RefPtr<Gst::XOverlay>&',`Glib::RefPtr<Gst::XOverlay>',`<gstreamermm/xoverlay.h>')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]