diff --git a/ChangeLog b/ChangeLog
index 39fc8f0a87..add9eda8f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-12-16  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* docs/plugins/Makefile.am:
+	* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
+	* docs/plugins/gst-plugins-bad-plugins-sections.txt:
+	* docs/plugins/gst-plugins-bad-plugins.args:
+	* docs/plugins/gst-plugins-bad-plugins.hierarchy:
+	* docs/plugins/gst-plugins-bad-plugins.interfaces:
+	* docs/plugins/gst-plugins-bad-plugins.prerequisites:
+	* docs/plugins/inspect/plugin-ladspa.xml:
+	* docs/plugins/inspect/plugin-musepack.xml:
+	* docs/plugins/inspect/plugin-mxf.xml:
+	* gst/mxf/mxfdemux.c:
+	* gst/mxf/mxfdemux.h:
+	Add initial documentation for the MXF plugin and mxfdemux.
+
 2008-12-16  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/mxf/mxfdemux.c:
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index c6f74eb4c4..f132618dcf 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -124,6 +124,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/dvdspu/gstdvdspu.h \
 	$(top_srcdir)/gst/festival/gstfestival.h \
 	$(top_srcdir)/gst/modplug/gstmodplug.h \
+	$(top_srcdir)/gst/mxf/mxfdemux.h \
 	$(top_srcdir)/gst/nuvdemux/gstnuvdemux.h \
 	$(top_srcdir)/gst/rawparse/gstaudioparse.h \
 	$(top_srcdir)/gst/rawparse/gstvideoparse.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 84e50fbc78..01f6d45609 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -47,6 +47,7 @@
     <xi:include href="xml/element-mpeg2enc.xml" />
     <xi:include href="xml/element-mplex.xml" />
     <xi:include href="xml/element-mythtvsrc.xml" />
+    <xi:include href="xml/element-mxfdemux.xml" />
     <xi:include href="xml/element-nuvdemux.xml" />
     <xi:include href="xml/element-output-selector.xml" />
     <xi:include href="xml/element-scaletempo.xml" />
@@ -111,6 +112,7 @@
     <xi:include href="xml/plugin-musepack.xml" />
     <xi:include href="xml/plugin-musicbrainz.xml" />
     <xi:include href="xml/plugin-mve.xml" />
+    <xi:include href="xml/plugin-mxf.xml" />
     <xi:include href="xml/plugin-nas.xml" />
     <xi:include href="xml/plugin-neon.xml" />
     <xi:include href="xml/plugin-nsfdec.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 6587b04c94..4c52bf492d 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -465,6 +465,20 @@ GST_TYPE_MYTHTV_SRC
 gst_mythtv_src_get_type
 </SECTION>
 
+<SECTION>
+<FILE>element-mxfdemux</FILE>
+<TITLE>mxfdemux</TITLE>
+GstMXFDemux
+<SUBSECTION Standard>
+GstMXFDemuxClass
+GST_IS_MXF_DEMUX
+GST_IS_MXF_DEMUX_CLASS
+GST_MXF_DEMUX
+GST_MXF_DEMUX_CLASS
+GST_TYPE_MXF_DEMUX
+gst_mxf_demux_get_type
+</SECTION>
+
 <SECTION>
 <FILE>element-nuvdemux</FILE>
 <TITLE>nuvdemux</TITLE>
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 919687d6d6..cb215bc326 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -1681,7 +1681,7 @@
 <ARG>
 <NAME>GstDvbSrc::diseqc-source</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,7]</RANGE>
+<RANGE>[G_MAXULONG,7]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>diseqc source</NICK>
 <BLURB>DISEqC selected source (-1 disabled) (DVB-S).</BLURB>
@@ -17455,7 +17455,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Path where to search for RealPlayer codecs</NICK>
 <BLURB>Path where to search for RealPlayer codecs.</BLURB>
-<DEFAULT>"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs"</DEFAULT>
+<DEFAULT>"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs"</DEFAULT>
 </ARG>
 
 <ARG>
@@ -17495,7 +17495,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>Path where to search for RealPlayer codecs</NICK>
 <BLURB>Path where to search for RealPlayer codecs.</BLURB>
-<DEFAULT>"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs"</DEFAULT>
+<DEFAULT>"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs"</DEFAULT>
 </ARG>
 
 <ARG>
@@ -18431,7 +18431,7 @@
 <ARG>
 <NAME>DvbBaseBin::diseqc-source</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,7]</RANGE>
+<RANGE>[G_MAXULONG,7]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>diseqc source</NICK>
 <BLURB>DISEqC selected source (-1 disabled) (DVB-S).</BLURB>
@@ -19396,7 +19396,7 @@
 <ARG>
 <NAME>GstAppSrc::size</NAME>
 <TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Size</NICK>
 <BLURB>The size of the data stream (-1 if unknown).</BLURB>
@@ -22156,7 +22156,7 @@
 <ARG>
 <NAME>GstTwoLame::psymodel</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,4]</RANGE>
+<RANGE>[G_MAXULONG,4]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Psychoacoustic Model</NICK>
 <BLURB>Psychoacoustic model used to encode the audio.</BLURB>
@@ -22306,7 +22306,7 @@
 <ARG>
 <NAME>GstDCCPClientSrc::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The socket file descriptor.</BLURB>
@@ -22346,7 +22346,7 @@
 <ARG>
 <NAME>GstDCCPServerSink::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The client socket file descriptor.</BLURB>
@@ -22406,7 +22406,7 @@
 <ARG>
 <NAME>GstDCCPClientSink::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The socket file descriptor.</BLURB>
@@ -22466,7 +22466,7 @@
 <ARG>
 <NAME>GstDCCPServerSrc::sockfd</NAME>
 <TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Socket fd</NICK>
 <BLURB>The client socket file descriptor.</BLURB>
@@ -22586,7 +22586,7 @@
 <ARG>
 <NAME>GstPcapParse::dst-port</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,65535]</RANGE>
+<RANGE>[G_MAXULONG,65535]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Destination port</NICK>
 <BLURB>Destination port to restrict to.</BLURB>
@@ -22606,7 +22606,7 @@
 <ARG>
 <NAME>GstPcapParse::src-port</NAME>
 <TYPE>gint</TYPE>
-<RANGE>[-1,65535]</RANGE>
+<RANGE>[G_MAXULONG,65535]</RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Source port</NICK>
 <BLURB>Source port to restrict to.</BLURB>
@@ -22883,3 +22883,13 @@
 <DEFAULT>16</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>GstMXFDemux::package</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Package</NICK>
+<BLURB>Material or Source package to use for playback.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 20679789a6..daacb3af46 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -1,7 +1,6 @@
 GObject
   GstObject
     GstPad
-      GstInterleavePad
     GstPadTemplate
       GstSignalProcessorPadTemplate
     GstPluginFeature
@@ -13,301 +12,134 @@ GObject
         GstPipeline
         RsnDvdBin
         DvbBaseBin
-        GstRgVolume
-        GstSDPDemux
         GstRtpBin
         GstRtpClient
-      MpegTSParse
-      GstMusepackDec
-      GstBaseTransform
-        GstAudioFilter
-          GstOFA
-          GstBPMDetect
-          GstSpectrum
-          GstIirEqualizer
-            GstIirEqualizerNBands
-            GstIirEqualizer3Bands
-            GstIirEqualizer10Bands
-          GstStereo
-        GstVideoFilter
-          GstVideoAnalyse
-          GstVideoDetect
-          GstVideoMark
-        GstVideoColorspace
-        GstAudioresample
-        GstRgAnalysis
-        GstRgLimiter
-        GstDeinterlace
-        GstBayer2RGB
-        GstScaletempo
-        GstIIR
-      GstBaseSrc
-        GstPushSrc
-          GstNeonhttpSrc
-          GstBaseAudioSrc
-            GstJackAudioSrc
-            GstAudioSrc
-              GstOss4Source
-          GstMMS
-          GstSoupHTTPSrc
-          GstMythtvSrc
-          GstDvbSrc
-          GstVCDSrc
-          GstRfbSrc
-          GstDCCPClientSrc
-          GstDCCPServerSrc
-          GstMultiFileSrc
-        GstSFSrc
-        GstAppSrc
+        GstSDPDemux
+      GstBaseMetadata
+        GstMetadataDemux
+        GstMetadataMux
+      GstFaad
+      GstBz2enc
+      GstBz2dec
+      GstCDAudio
       GstBaseSink
-        GstBaseAudioSink
-          GstAudioSink
-            GstApExSink
-            GstSDLAudioSink
-            GstNasSink
-            GstOss4Sink
-          GstJackAudioSink
         GstVideoSink
           GstDfbVideoSink
           GstSDLVideoSink
-        GstSFSink
+        GstBaseAudioSink
+          GstAudioSink
+            GstNasSink
+            GstSDLAudioSink
+            GstApExSink
+            GstOss4Sink
+          GstJackAudioSink
         AlsaSPDIFSink
+        GstSFSink
         GstFBDEVSink
         GstAppSink
         GstDCCPServerSink
         GstDCCPClientSink
-        GstMultiFileSink
-      GstCeltEnc
-      GstCeltDec
-      GstPitch
-      GstFaad
+      GstBaseSrc
+        GstPushSrc
+          GstMythtvSrc
+          GstMMS
+          GstDc1394
+          GstBaseAudioSrc
+            GstJackAudioSrc
+            GstAudioSrc
+              GstOss4Source
+          GstNeonhttpSrc
+          GstVCDSrc
+          GstDvbSrc
+          GstRfbSrc
+          GstDCCPClientSrc
+          GstDCCPServerSrc
+        GstSFSrc
+        GstAppSrc
+      GstBaseTransform
+        GstAudioFilter
+          GstOFA
+          GstBPMDetect
+          GstStereo
+        GstBayer2RGB
+        GstScaletempo
+        GstVideoFilter
+          GstVideoAnalyse
+          GstVideoDetect
+          GstVideoMark
+        GstAudioresample
+        GstDeinterlace
+        GstIIR
+      GstDtsDec
+      GstMusepackDec
+      GstGSMEnc
+      GstGSMDec
+      GstWildmidi
       GstSignalProcessor
-        ladspa-mbeq
-        ladspa-imp
-        ladspa-highpass-iir
-        ladspa-tap-pitch
-        ladspa-divider
-        ladspa-Pulse-VCO
-        ladspa-Saw-VCO
-        ladspa-Rec-VCO
-        ladspa-se4
-        ladspa-tap-tubewarmth
-        ladspa-sc3
-        ladspa-triplePara
-        ladspa-dcRemove
-        ladspa-tap-tremolo
-        ladspa-gong
-        ladspa-sc4m
-        ladspa-tap-dynamics-m
-        ladspa-inv
-        ladspa-analogueOsc
-        ladspa-satanMaximiser
-        ladspa-lsFilter
-        ladspa-bodeShifterCV
-        ladspa-amPitchshift
-        ladspa-diode
-        ladspa-tap-stereo-echo
-        ladspa-harmonicGen
-        ladspa-chebstortion
-        ladspa-djFlanger
-        ladspa-sinCos
-        ladspa-svf
-        ladspa-rateShifter
-        ladspa-Sync-Saw-VCO
-        ladspa-Sync-Rect-VCO
-        ladspa-Sync-Tri-VCO
-        ladspa-decay
-        ladspa-multivoiceChorus
+        ladspa-amp-mono
+        ladspa-amp-stereo
+        ladspa-lpf
+        ladspa-hpf
+        ladspa-delay-5s
         ladspa-sine-faaa
         ladspa-sine-faac
         ladspa-sine-fcaa
         ladspa-sine-fcac
-        ladspa-shaper
-        ladspa-impulse-fc
-        ladspa-vynil
-        ladspa-foldover
-        ladspa-gate
-        ladspa-tap-rotspeak
-        ladspa-lfoPhaser
-        ladspa-fourByFourPole
-        ladspa-autoPhaser
-        ladspa-tap-equalizer-bw
-        ladspa-declip
-        ladspa-sc4
-        ladspa-gsm
-        ladspa-delay-n
-        ladspa-delay-l
-        ladspa-delay-c
-        ladspa-tapeDelay
-        ladspa-fadDelay
-        ladspa-fastLookaheadLimiter
-        ladspa-decimator
-        ladspa-surroundEncoder
-        ladspa-gverb
-        ladspa-hilbert
-        ladspa-retroFlange
-        ladspa-tap-reverb
-        ladspa-bodeShifter
-        ladspa-hermesFilter
-        ladspa-tap-chorusflanger
-        ladspa-matrixSpatialiser
-        ladspa-karaoke
-        ladspa-split
-        ladspa-sc1
-        ladspa-valve
-        ladspa-foverdrive
-        ladspa-lpf
-        ladspa-hpf
-        ladspa-hardLimiter
-        ladspa-pitchScaleHQ
-        ladspa-tap-pinknoise
-        ladspa-stepMuxer
-        ladspa-sinusWavewrapper
-        ladspa-dj-eq-mono
-        ladspa-dj-eq
-        ladspa-delay-5s
-        ladspa-notch-iir
-        ladspa-singlePara
-        ladspa-plate
-        ladspa-alias
-        ladspa-lcrDelay
-        ladspa-amp-mono
-        ladspa-amp-stereo
-        ladspa-tap-reflector
-        ladspa-delayorama
-        ladspa-pointerCastDistortion
-        ladspa-tap-limiter
-        ladspa-artificialLatency
-        ladspa-matrixMSSt
-        ladspa-gongBeater
         ladspa-noise-white
-        ladspa-valveRect
-        ladspa-freqTracker
-        ladspa-xfade
-        ladspa-xfade4
-        ladspa-fmOsc
-        ladspa-tap-equalizer
-        ladspa-tap-deesser
-        ladspa-ringmod-2i1o
-        ladspa-ringmod-1i1o1l
-        ladspa-bandpass-iir
-        ladspa-Ambisonics-11-mono-panner
-        ladspa-Ambisonics-11-stereo-panner
-        ladspa-Ambisonics-11-rotator
-        ladspa-Ambisonics-11-square-decoder
-        ladspa-Ambisonics-11-hexagon-decoder
-        ladspa-Ambisonics-11-cube-decoder
-        ladspa-bandpass-a-iir
-        ladspa-zm1
-        ladspa-G2reverb
-        ladspa-tap-doubler
-        ladspa-dysonCompress
-        ladspa-pitchScale
-        ladspa-tap-dynamics-st
-        ladspa-waveTerrain
-        ladspa-bwxover-iir
-        ladspa-buttlow-iir
-        ladspa-butthigh-iir
-        ladspa-modDelay
-        ladspa-amp
-        ladspa-giantFlange
-        ladspa-allpass-n
-        ladspa-allpass-l
-        ladspa-allpass-c
-        ladspa-combSplitter
-        ladspa-comb
-        ladspa-revdelay
-        ladspa-const
-        ladspa-tap-sigmoid
-        ladspa-crossoverDist
-        ladspa-tap-vibrato
-        ladspa-lowpass-iir
-        ladspa-transient
-        ladspa-sc2
-        ladspa-Ambisonics-21-panner
-        ladspa-Ambisonics-21-rotator
-        ladspa-flanger
-        ladspa-tap-autopan
-        ladspa-comb-n
-        ladspa-comb-l
-        ladspa-comb-c
-        ladspa-smoothDecimate
-        ladspa-sifter
-        ladspa-matrixStMS
-      GstDtsDec
       GstTwoLame
-      GstAmrwbDec
-      GstAmrwbParse
-      GstAmrwbEnc
-      GstGSMEnc
-      GstGSMDec
-      GstFaac
-      GstX264Enc
-      GstCDAudio
-      GstMplex
-      GstMpeg2enc
-      GstWildmidi
-      GstSpcDec
-      GstXvidEnc
-      GstXvidDec
-      GstBz2enc
-      GstBz2dec
+      GstPitch
+      GstCeltEnc
+      GstCeltDec
       GstTRM
-      GstBaseMetadata
-        GstMetadataDemux
-        GstMetadataMux
       GstOss4Mixer
-      GstDVDSpu
-      GstAacBaseParse
-        GstAacParse
-      GstDeinterlace2
-      GstTtaParse
-      GstTtaDec
-      GstMpeg4VParse
-      MpegVideoParse
-      GstH264Parse
-      GstVMncDec
-      GstSpeed
-      GstFLVDemux
-      GstFlvMux
-      GstCDXAParse
-      GstVcdParse
-      GstModPlug
-      GstSrtEnc
-      GstRawParse
-        GstVideoParse
-        GstAudioParse
-      GstQTMux
-      GstMP4Mux
-      GstGPPMux
-      GstMJ2Mux
-      GstMXFDemux
-      GstY4mEncode
-      MpegTsMux
-      GstFestival
-      GstFlacBaseParse
-        GstFlacParse
-      GstMpegPSDemux
-      GstMpegTSDemux
-      GstNsfDec
-      GstInterleave
-      GstDeinterleave
-      AIFFParse
-      GstPcapParse
       GstMveDemux
       GstMveMux
+      GstDeinterlace2
       GstRtpJitterBuffer
       GstRtpPtDemux
       GstRtpSession
       GstRtpSsrcDemux
+      GstMpegPSDemux
+      GstMpegTSDemux
+      MpegTSParse
+      GstH264Parse
+      GstMpeg4VParse
+      MpegVideoParse
+      GstFLVDemux
+      GstFlvMux
       GstNuvDemux
-      GstAmrBaseParse
-        GstAmrParse
-      GstFreeze
-      GstRealVideoDec
-      GstRealAudioDec
+      GstRawParse
+        GstVideoParse
+        GstAudioParse
+      GstSpeed
       GstInputSelector
       GstOutputSelector
+      GstQTMux
+      GstMP4Mux
+      GstGPPMux
+      GstMJ2Mux
+      GstAacBaseParse
+        GstAacParse
+      GstCDXAParse
+      GstVcdParse
+      GstNsfDec
+      GstTtaParse
+      GstTtaDec
+      GstModPlug
+      GstY4mEncode
+      GstFreeze
+      GstVMncDec
+      AIFFParse
+      GstSrtEnc
+      GstFestival
+      MpegTsMux
+      GstDVDSpu
+      GstMXFDemux
+      GstRealVideoDec
+      GstRealAudioDec
+      GstAmrBaseParse
+        GstAmrParse
+      GstPcapParse
     GstBus
     GstTask
     GstClock
@@ -320,17 +152,17 @@ GObject
       GstJackAudioSinkRingBuffer
   GstSignalObject
   GstColorBalanceChannel
-  n
-  get_name
   RTPSession
+  FluTsPatInfo
+  FluTsPmtInfo
 GInterface
   GTypePlugin
   GstChildProxy
   GstURIHandler
-  GstImplementsInterface
-  GstMixer
   GstTagSetter
+  GstImplementsInterface
   GstNavigation
   GstColorBalance
   GstXOverlay
+  GstMixer
   GstPropertyProbe
diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces
index ec5677d7c5..370258802c 100644
--- a/docs/plugins/gst-plugins-bad-plugins.interfaces
+++ b/docs/plugins/gst-plugins-bad-plugins.interfaces
@@ -2,28 +2,22 @@ GstBin GstChildProxy
 GstPipeline GstChildProxy
 RsnDvdBin GstChildProxy GstURIHandler
 DvbBaseBin GstChildProxy GstURIHandler
-GstRgVolume GstChildProxy
-GstSDPDemux GstChildProxy
 GstRtpBin GstChildProxy
 GstRtpClient GstChildProxy
-GstIirEqualizer GstChildProxy
-GstIirEqualizerNBands GstChildProxy
-GstIirEqualizer3Bands GstChildProxy
-GstIirEqualizer10Bands GstChildProxy
-GstNeonhttpSrc GstURIHandler
-GstOss4Source GstImplementsInterface GstMixer GstPropertyProbe
-GstMMS GstURIHandler
-GstSoupHTTPSrc GstURIHandler
-GstMythtvSrc GstURIHandler
-GstVCDSrc GstURIHandler
-GstAppSrc GstURIHandler
-GstApExSink GstImplementsInterface GstMixer
-GstOss4Sink GstPropertyProbe
+GstSDPDemux GstChildProxy
+GstMetadataMux GstTagSetter
+GstCDAudio GstURIHandler
 GstDfbVideoSink GstImplementsInterface GstNavigation GstColorBalance
 GstSDLVideoSink GstImplementsInterface GstNavigation GstXOverlay
+GstApExSink GstImplementsInterface GstMixer
+GstOss4Sink GstPropertyProbe
+GstMythtvSrc GstURIHandler
+GstMMS GstURIHandler
+GstOss4Source GstImplementsInterface GstMixer GstPropertyProbe
+GstNeonhttpSrc GstURIHandler
+GstVCDSrc GstURIHandler
+GstAppSrc GstURIHandler
 GstCeltEnc GstTagSetter
-GstCDAudio GstURIHandler
-GstMetadataMux GstTagSetter
 GstOss4Mixer GstImplementsInterface GstMixer GstPropertyProbe
 GstDeinterlace2 GstChildProxy
 GstQTMux GstTagSetter
diff --git a/docs/plugins/gst-plugins-bad-plugins.prerequisites b/docs/plugins/gst-plugins-bad-plugins.prerequisites
index 8074eb4fca..98fef21350 100644
--- a/docs/plugins/gst-plugins-bad-plugins.prerequisites
+++ b/docs/plugins/gst-plugins-bad-plugins.prerequisites
@@ -1,6 +1,6 @@
 GstChildProxy GstObject
-GstImplementsInterface GstObject GstElement
-GstMixer GstObject GstImplementsInterface GstElement
 GstTagSetter GstObject GstElement
+GstImplementsInterface GstObject GstElement
 GstColorBalance GstObject GstImplementsInterface GstElement
 GstXOverlay GstObject GstImplementsInterface GstElement
+GstMixer GstObject GstImplementsInterface GstElement
diff --git a/docs/plugins/inspect/plugin-ladspa.xml b/docs/plugins/inspect/plugin-ladspa.xml
index 34e68833d8..40b08f49b4 100644
--- a/docs/plugins/inspect/plugin-ladspa.xml
+++ b/docs/plugins/inspect/plugin-ladspa.xml
@@ -9,909 +9,6 @@
   <package>GStreamer Bad Plug-ins CVS/prerelease</package>
   <origin>Unknown package origin</origin>
   <elements>
-    <element>
-      <name>ladspa-Ambisonics-11-cube-decoder</name>
-      <longname>AMB order 1,1 cube decoder</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 cube decoder</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-ULB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-URB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-URF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-ULF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-DLB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-DRB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-DRF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-DLF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Z</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-X</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-W</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-11-hexagon-decoder</name>
-      <longname>AMB order 1,1 hexagon decoder</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 hexagon decoder</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-L-LF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-LB-LB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-RB-B</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-R-RB</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-RF-RF</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-LF-F</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Z</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-X</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-W</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-11-mono-panner</name>
-      <longname>AMB order 1,1 mono panner</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 mono panner</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-Z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-Y</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-X</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-W</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-11-rotator</name>
-      <longname>AMB order 1,1 rotator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 rotator</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-Z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-Y</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-X</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-W</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Z</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-X</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-W</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-11-square-decoder</name>
-      <longname>AMB order 1,1 square decoder</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 square decoder</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-LB-L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-RB-B</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-RF-R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-LF-F</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Z</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-X</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-W</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-11-stereo-panner</name>
-      <longname>AMB order 1,1 stereo panner</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 1,1 stereo panner</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-Z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-Y</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-X</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-W</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-21-panner</name>
-      <longname>AMB order 2,1 panner</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 2,1 panner</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-Z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-V</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-U</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-Y</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-X</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-W</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Ambisonics-21-rotator</name>
-      <longname>AMB order 2,1 rotator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AMB order 2,1 rotator</description>
-      <author>Fons Adriaensen &lt;fons@kokkinizita.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Out-Z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-V</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-U</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-Y</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-X</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out-W</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Z</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-V</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-U</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-Y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-X</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In-W</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-G2reverb</name>
-      <longname>Stereo reverb</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Stereo reverb</description>
-      <author>Fons Adriaensen &lt;fons.adriaensen@alcatel.be&gt;</author>
-      <pads>
-        <caps>
-          <name>Out_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Out_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>In_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Pulse-VCO</name>
-      <longname>Pulse-VCO  --  Anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Pulse-VCO  --  Anti-aliased oscillator</description>
-      <author>Fons Adriaensen &lt;fons.adriaensen@alcatel.be&gt;</author>
-      <pads>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Rec-VCO</name>
-      <longname>Rec-VCO  --  Anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Rec-VCO  --  Anti-aliased oscillator</description>
-      <author>Fons Adriaensen &lt;fons.adriaensen@alcatel.be&gt;</author>
-      <pads>
-        <caps>
-          <name>Sync</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Mod</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Saw-VCO</name>
-      <longname>Saw-VCO  --  Anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Saw-VCO  --  Anti-aliased oscillator</description>
-      <author>Fons Adriaensen &lt;fons.adriaensen@alcatel.be&gt;</author>
-      <pads>
-        <caps>
-          <name>Sync</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Sync-Rect-VCO</name>
-      <longname>Sync-Rect-VCO  --  Hard-sync-capable anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Sync-Rect-VCO  --  Hard-sync-capable anti-aliased oscillator</description>
-      <author>Sean Bolton &lt;musound AT jps DOT net&gt;</author>
-      <pads>
-        <caps>
-          <name>Sync_In</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Wave_Mod</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sync_Out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Sync-Saw-VCO</name>
-      <longname>Sync-Saw-VCO  --  Hard-sync-capable anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Sync-Saw-VCO  --  Hard-sync-capable anti-aliased oscillator</description>
-      <author>Sean Bolton &lt;musound AT jps DOT net&gt;</author>
-      <pads>
-        <caps>
-          <name>Sync_In</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sync_Out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-Sync-Tri-VCO</name>
-      <longname>Sync-Tri-VCO  --  Hard-sync-capable anti-aliased oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Sync-Tri-VCO  --  Hard-sync-capable anti-aliased oscillator</description>
-      <author>Sean Bolton &lt;musound AT jps DOT net&gt;</author>
-      <pads>
-        <caps>
-          <name>Sync_In</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Wave_Mod</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lin_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Exp_FM</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sync_Out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-alias</name>
-      <longname>Aliasing</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Aliasing</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-allpass-c</name>
-      <longname>Allpass delay line, cubic spline interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Allpass delay line, cubic spline interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-allpass-l</name>
-      <longname>Allpass delay line, linear interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Allpass delay line, linear interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-allpass-n</name>
-      <longname>Allpass delay line, noninterpolating</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Allpass delay line, noninterpolating</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-amPitchshift</name>
-      <longname>AM pitchshifter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>AM pitchshifter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-amp</name>
-      <longname>Simple amplifier</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Simple amplifier</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-amp-mono</name>
       <longname>Mono Amplifier</longname>
@@ -966,498 +63,6 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-analogueOsc</name>
-      <longname>Analogue Oscillator</longname>
-      <class>Source/Audio/LADSPA</class>
-      <description>Analogue Oscillator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-artificialLatency</name>
-      <longname>Artificial latency</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Artificial latency</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-autoPhaser</name>
-      <longname>Auto phaser</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Auto phaser</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-bandpass-a-iir</name>
-      <longname>Glame Bandpass Analog Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Glame Bandpass Analog Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-bandpass-iir</name>
-      <longname>Glame Bandpass Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Glame Bandpass Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-bodeShifter</name>
-      <longname>Bode frequency shifter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Bode frequency shifter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Up_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Down_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-bodeShifterCV</name>
-      <longname>Bode frequency shifter (CV)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Bode frequency shifter (CV)</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Mix_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Up_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Down_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Shift_CV</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-butthigh-iir</name>
-      <longname>GLAME Butterworth Highpass</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>GLAME Butterworth Highpass</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-buttlow-iir</name>
-      <longname>GLAME Butterworth Lowpass</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>GLAME Butterworth Lowpass</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-bwxover-iir</name>
-      <longname>Glame Butterworth X-over Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Glame Butterworth X-over Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>HP-Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>LP-Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-chebstortion</name>
-      <longname>Chebyshev distortion</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Chebyshev distortion</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-comb</name>
-      <longname>Comb Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Comb Filter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-comb-c</name>
-      <longname>Comb delay line, cubic spline interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Comb delay line, cubic spline interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-comb-l</name>
-      <longname>Comb delay line, linear interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Comb delay line, linear interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-comb-n</name>
-      <longname>Comb delay line, noninterpolating</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Comb delay line, noninterpolating</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-combSplitter</name>
-      <longname>Comb Splitter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Comb Splitter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_2</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_1</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-const</name>
-      <longname>Constant Signal Generator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Constant Signal Generator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-crossoverDist</name>
-      <longname>Crossover distortion</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Crossover distortion</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-dcRemove</name>
-      <longname>DC Offset Remover</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>DC Offset Remover</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-decay</name>
-      <longname>Exponential signal decay</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Exponential signal decay</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-decimator</name>
-      <longname>Decimator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Decimator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-declip</name>
-      <longname>Declipper</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Declipper</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-delay-5s</name>
       <longname>Simple Delay Line</longname>
@@ -1479,651 +84,6 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-delay-c</name>
-      <longname>Simple delay line, cubic spline interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Simple delay line, cubic spline interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-delay-l</name>
-      <longname>Simple delay line, linear interpolation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Simple delay line, linear interpolation</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-delay-n</name>
-      <longname>Simple delay line, noninterpolating</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Simple delay line, noninterpolating</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-delayorama</name>
-      <longname>Delayorama</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Delayorama</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-diode</name>
-      <longname>Diode Processor</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Diode Processor</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-divider</name>
-      <longname>Audio Divider (Suboctave Generator)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Audio Divider (Suboctave Generator)</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-dj-eq</name>
-      <longname>DJ EQ</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>DJ EQ</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-dj-eq-mono</name>
-      <longname>DJ EQ (mono)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>DJ EQ (mono)</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-djFlanger</name>
-      <longname>DJ flanger</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>DJ flanger</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-dysonCompress</name>
-      <longname>Dyson compressor</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Dyson compressor</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-fadDelay</name>
-      <longname>Fractionally Addressed Delay Line</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Fractionally Addressed Delay Line</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-fastLookaheadLimiter</name>
-      <longname>Fast Lookahead limiter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Fast Lookahead limiter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_2</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_1</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_2</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_1</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-flanger</name>
-      <longname>Flanger</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Flanger</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-fmOsc</name>
-      <longname>FM Oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>FM Oscillator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Frequency_-Hz-</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-foldover</name>
-      <longname>Foldover distortion</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Foldover distortion</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-fourByFourPole</name>
-      <longname>4 x 4 pole allpass</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>4 x 4 pole allpass</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-foverdrive</name>
-      <longname>Fast overdrive</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Fast overdrive</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-freqTracker</name>
-      <longname>Frequency tracker</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Frequency tracker</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Frequency_-Hz-</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-gate</name>
-      <longname>Gate</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Gate</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-giantFlange</name>
-      <longname>Giant flange</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Giant flange</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-gong</name>
-      <longname>Gong model</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Gong model</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-gongBeater</name>
-      <longname>Gong beater</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Gong beater</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-gsm</name>
-      <longname>GSM simulator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>GSM simulator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-gverb</name>
-      <longname>GVerb</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>GVerb</description>
-      <author>Juhana Sadeharju &lt;kouhia at nic.funet.fi&gt;, LADSPAification by Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-hardLimiter</name>
-      <longname>Hard Limiter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Hard Limiter</description>
-      <author>Marcus Andersson</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-harmonicGen</name>
-      <longname>Harmonic generator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Harmonic generator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-hermesFilter</name>
-      <longname>Hermes Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Hermes Filter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-highpass-iir</name>
-      <longname>Glame Highpass Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Glame Highpass Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-hilbert</name>
-      <longname>Hilbert transformer</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Hilbert transformer</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>90deg_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>0deg_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-hpf</name>
       <longname>Simple High Pass Filter</longname>
@@ -2145,171 +105,6 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-imp</name>
-      <longname>Impulse convolver</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Impulse convolver</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-impulse-fc</name>
-      <longname>Nonbandlimited single-sample impulses (Frequency: Control)</longname>
-      <class>Source/Audio/LADSPA</class>
-      <description>Nonbandlimited single-sample impulses (Frequency: Control)</description>
-      <author>Andy Wingo &lt;wingo at pobox dot com&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-inv</name>
-      <longname>Inverter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Inverter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-karaoke</name>
-      <longname>Karaoke</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Karaoke</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_out</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Right_in</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_in</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-lcrDelay</name>
-      <longname>L/C/R Delay</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>L/C/R Delay</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>R_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>L_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>R_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>L_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-lfoPhaser</name>
-      <longname>LFO Phaser</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>LFO Phaser</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-lowpass-iir</name>
-      <longname>Glame Lowpass Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Glame Lowpass Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-lpf</name>
       <longname>Simple Low Pass Filter</longname>
@@ -2331,195 +126,6 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-lsFilter</name>
-      <longname>LS Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>LS Filter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-matrixMSSt</name>
-      <longname>Matrix: MS to Stereo</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Matrix: MS to Stereo</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Side</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Mid</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-matrixSpatialiser</name>
-      <longname>Matrix Spatialiser</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Matrix Spatialiser</description>
-      <author>Joern Nettingsmeier &lt;nettings@folkwang-hochschule.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-matrixStMS</name>
-      <longname>Matrix: Stereo to MS</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Matrix: Stereo to MS</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Side</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Mid</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-mbeq</name>
-      <longname>Multiband EQ</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Multiband EQ</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-modDelay</name>
-      <longname>Modulatable delay</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Modulatable delay</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Delay_-s-</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-multivoiceChorus</name>
-      <longname>Multivoice Chorus</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Multivoice Chorus</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-noise-white</name>
       <longname>White Noise Source</longname>
@@ -2535,486 +141,6 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-notch-iir</name>
-      <longname>Mag's Notch Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Mag's Notch Filter</description>
-      <author>Alexander Ehlert &lt;mag@glame.de&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-pitchScale</name>
-      <longname>Pitch Scaler</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Pitch Scaler</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-pitchScaleHQ</name>
-      <longname>Higher Quality Pitch Scaler</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Higher Quality Pitch Scaler</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-plate</name>
-      <longname>Plate reverb</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Plate reverb</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-pointerCastDistortion</name>
-      <longname>Pointer cast distortion</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Pointer cast distortion</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-rateShifter</name>
-      <longname>Rate shifter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Rate shifter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-retroFlange</name>
-      <longname>Retro Flanger</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Retro Flanger</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-revdelay</name>
-      <longname>Reverse Delay (5s max)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Reverse Delay (5s max)</description>
-      <author>Jesse Chappell &lt;jesse at essej dot net&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-ringmod-1i1o1l</name>
-      <longname>Ringmod with LFO</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Ringmod with LFO</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-ringmod-2i1o</name>
-      <longname>Ringmod with two inputs</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Ringmod with two inputs</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Modulator</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-satanMaximiser</name>
-      <longname>Barry's Satan Maximiser</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Barry's Satan Maximiser</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sc1</name>
-      <longname>SC1</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SC1</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sc2</name>
-      <longname>SC2</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SC2</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sidechain</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sc3</name>
-      <longname>SC3</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SC3</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Right_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sidechain</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sc4</name>
-      <longname>SC4</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SC4</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Right_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sc4m</name>
-      <longname>SC4 mono</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SC4 mono</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-se4</name>
-      <longname>SE4</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>SE4</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Right_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Right_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Left_input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-shaper</name>
-      <longname>Wave shaper</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Wave shaper</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sifter</name>
-      <longname>Signal sifter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Signal sifter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sinCos</name>
-      <longname>Sine + cosine oscillator</longname>
-      <class>Source/Audio/LADSPA</class>
-      <description>Sine + cosine oscillator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Cosine_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Sine_output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
     <element>
       <name>ladspa-sine-faaa</name>
       <longname>Sine Oscillator (Freq:audio, Amp:audio)</longname>
@@ -3099,1001 +225,5 @@
         </caps>
       </pads>
     </element>
-    <element>
-      <name>ladspa-singlePara</name>
-      <longname>Single band parametric</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Single band parametric</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-sinusWavewrapper</name>
-      <longname>Sinus wavewrapper</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Sinus wavewrapper</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-smoothDecimate</name>
-      <longname>Smooth Decimator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Smooth Decimator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-split</name>
-      <longname>Mono to Stereo splitter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Mono to Stereo splitter</description>
-      <author>Frank Neumann &lt;franky@users.sourceforge.net&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_2</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_1</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-stepMuxer</name>
-      <longname>Step Demuxer</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Step Demuxer</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_8</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_7</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_6</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_5</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_4</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_3</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_2</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_1</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Clock</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-surroundEncoder</name>
-      <longname>Surround matrix encoder</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Surround matrix encoder</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Rt</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Lt</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>S</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>C</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-svf</name>
-      <longname>State Variable Filter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>State Variable Filter</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-autopan</name>
-      <longname>TAP AutoPanner</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP AutoPanner</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-chorusflanger</name>
-      <longname>TAP Chorus/Flanger</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Chorus/Flanger</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-deesser</name>
-      <longname>TAP DeEsser</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP DeEsser</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-doubler</name>
-      <longname>TAP Fractal Doubler</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Fractal Doubler</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-dynamics-m</name>
-      <longname>TAP Dynamics (M)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Dynamics (M)</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-dynamics-st</name>
-      <longname>TAP Dynamics (St)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Dynamics (St)</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_Right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_Left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-equalizer</name>
-      <longname>TAP Equalizer</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Equalizer</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-equalizer-bw</name>
-      <longname>TAP Equalizer/BW</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Equalizer/BW</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-limiter</name>
-      <longname>TAP Scaling Limiter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Scaling Limiter</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-pinknoise</name>
-      <longname>TAP Pink/Fractal Noise</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Pink/Fractal Noise</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-pitch</name>
-      <longname>TAP Pitch Shifter</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Pitch Shifter</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-reflector</name>
-      <longname>TAP Reflector</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Reflector</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-reverb</name>
-      <longname>TAP Reverberator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Reverberator</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_Right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_Left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-rotspeak</name>
-      <longname>TAP Rotary Speaker</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Rotary Speaker</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-sigmoid</name>
-      <longname>TAP Sigmoid Booster</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Sigmoid Booster</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-stereo-echo</name>
-      <longname>TAP Stereo Echo</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Stereo Echo</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_Right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_Left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_Left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-tremolo</name>
-      <longname>TAP Tremolo</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Tremolo</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output_0</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_0</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-tubewarmth</name>
-      <longname>TAP TubeWarmth</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP TubeWarmth</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tap-vibrato</name>
-      <longname>TAP Vibrato</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>TAP Vibrato</description>
-      <author>Tom Szilagyi</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-tapeDelay</name>
-      <longname>Tape Delay Simulation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Tape Delay Simulation</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-transient</name>
-      <longname>Transient mangler</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Transient mangler</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-triplePara</name>
-      <longname>Triple band parametric with shelves</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Triple band parametric with shelves</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-valve</name>
-      <longname>Valve saturation</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Valve saturation</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-valveRect</name>
-      <longname>Valve rectifier</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Valve rectifier</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-vynil</name>
-      <longname>VyNil (Vinyl Effect)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>VyNil (Vinyl Effect)</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_R</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_L</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_R</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_L</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-waveTerrain</name>
-      <longname>Wave Terrain Oscillator</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Wave Terrain Oscillator</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>z</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>y</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>x</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-xfade</name>
-      <longname>Crossfade</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Crossfade</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_B_right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_B_left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_A_right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_A_left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-xfade4</name>
-      <longname>Crossfade (4 outs)</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>Crossfade (4 outs)</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output_B_right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_B_left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_A_right</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Output_A_left</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_B_right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_B_left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_A_right</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input_A_left</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>ladspa-zm1</name>
-      <longname>z-1</longname>
-      <class>Filter/Effect/Audio/LADSPA</class>
-      <description>z-1</description>
-      <author>Steve Harris &lt;steve@plugin.org.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>Output</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-        <caps>
-          <name>Input</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-float, width=(int)32, rate=(int)[ 1, 2147483647 ], channels=(int)1, endianness=(int)1234</details>
-        </caps>
-      </pads>
-    </element>
   </elements>
 </plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-musepack.xml b/docs/plugins/inspect/plugin-musepack.xml
index 19bccdd199..068205d5cf 100644
--- a/docs/plugins/inspect/plugin-musepack.xml
+++ b/docs/plugins/inspect/plugin-musepack.xml
@@ -20,7 +20,7 @@
           <name>sink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>audio/x-musepack, streamversion=(int){ 7, 8 }</details>
+          <details>audio/x-musepack, streamversion=(int)7</details>
         </caps>
         <caps>
           <name>src</name>
diff --git a/docs/plugins/inspect/plugin-mxf.xml b/docs/plugins/inspect/plugin-mxf.xml
new file mode 100644
index 0000000000..13a21a5875
--- /dev/null
+++ b/docs/plugins/inspect/plugin-mxf.xml
@@ -0,0 +1,34 @@
+<plugin>
+  <name>mxf</name>
+  <description>MXF plugin library</description>
+  <filename>../../gst/mxf/.libs/libgstmxf.so</filename>
+  <basename>libgstmxf.so</basename>
+  <version>0.10.9.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-bad</source>
+  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>mxfdemux</name>
+      <longname>MXF Demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>Demux MXF files</description>
+      <author>Sebastian Dröge &lt;sebastian.droege@collabora.co.uk&gt;</author>
+      <pads>
+        <caps>
+          <name>track_%u</name>
+          <direction>source</direction>
+          <presence>sometimes</presence>
+          <details>ANY</details>
+        </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>application/mxf</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file
diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index 42338ca7ad..b2f43ed844 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -17,6 +17,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/**
+ * SECTION:element-mxfdemux
+ *
+ * mxfdemux demuxes an MXF file into the different contained streams.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch -v filesrc location=/path/to/mxf ! mxfdemux ! audioconvert ! autoaudiosink
+ * ]| This pipeline demuxes an MXF file and outputs one of the contained raw audio streams.
+ * </refsect2>
+ */
+
 /* TODO:
  *   - Implement support for DMS-1 and descriptive metadata tracks
  *   - Differentiate UL and UUIDs, the former can define an object system
@@ -546,11 +559,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
 
   for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
     if (demux->preface->content_storage->packages[i] &&
-        MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->
-            content_storage->packages[i])) {
+        MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage->
+            packages[i])) {
       ret =
-          MXF_METADATA_GENERIC_PACKAGE (demux->preface->
-          content_storage->packages[i]);
+          MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage->
+          packages[i]);
       break;
     }
   }
diff --git a/gst/mxf/mxfdemux.h b/gst/mxf/mxfdemux.h
index bb9d5933a9..1e5bef4dd4 100644
--- a/gst/mxf/mxfdemux.h
+++ b/gst/mxf/mxfdemux.h
@@ -48,6 +48,8 @@ struct _GstMXFDemux
   GstPad *sinkpad;
   GPtrArray *src;
 
+  /* < private > */
+
   GstAdapter *adapter;
 
   GstSegment segment;