funnel: Integrate into the build system and rename the types

5 files changed, 74 insertions, 24 deletions

diff --git a/docs/plugins/gstreamer-plugins-docs.sgml b/docs/plugins/gstreamer-plugins-docs.sgml
index 3d6a15cb6..a6c34e9e0 100644
--- a/docs/plugins/gstreamer-plugins-docs.sgml
+++ b/docs/plugins/gstreamer-plugins-docs.sgml
@@ -24,6 +24,7 @@
     <xi:include href="xml/element-fdsrc.xml" />
     <xi:include href="xml/element-filesrc.xml" />
     <xi:include href="xml/element-filesink.xml" />
+    <xi:include href="xml/element-funnel.xml" />
     <xi:include href="xml/element-identity.xml" />
     <xi:include href="xml/element-input-selector.xml" />
     <xi:include href="xml/element-multiqueue.xml" />
diff --git a/docs/plugins/gstreamer-plugins-sections.txt b/docs/plugins/gstreamer-plugins-sections.txt
index 742fdf9da..e862a13f7 100644
--- a/docs/plugins/gstreamer-plugins-sections.txt
+++ b/docs/plugins/gstreamer-plugins-sections.txt
@@ -96,6 +96,21 @@ gst_file_sink_get_type
 </SECTION>
 
 <SECTION>
+<FILE>element-funnel</FILE>
+<TITLE>funnel</TITLE>
+GstFunnel
+<SUBSECTION Standard>
+GstFunnelClass
+GST_FUNNEL
+GST_IS_FUNNEL
+GST_TYPE_FUNNEL
+GST_FUNNEL_CLASS
+GST_IS_FUNNEL_CLASS
+<SUBSECTION Private>
+gst_funnel_get_type
+</SECTION>
+
+<SECTION>
 <FILE>element-capsfilter</FILE>
 <TITLE>capsfilter</TITLE>
 GstCapsFilter
diff --git a/docs/plugins/gstreamer-plugins.hierarchy b/docs/plugins/gstreamer-plugins.hierarchy
index d6a33d1a2..4201ecb5b 100644
--- a/docs/plugins/gstreamer-plugins.hierarchy
+++ b/docs/plugins/gstreamer-plugins.hierarchy
@@ -1,43 +1,44 @@
 GObject
   GstObject
-    GstBus
-    GstClock
+    GstPad
+    GstPadTemplate
+    GstPluginFeature
+      GstElementFactory
+      GstTypeFindFactory
+      GstIndexFactory
     GstElement
-      GstBaseSink
-        GstFakeSink
-        GstFdSink
-        GstFileSink
+      GstBin
+        GstPipeline
+      GstBaseTransform
+        GstCapsFilter
+        GstIdentity
       GstBaseSrc
         GstFakeSrc
-        GstFileSrc
         GstPushSrc
           GstFdSrc
-      GstBaseTransform
-        GstCapsFilter
-        GstIdentity
-      GstBin
-        GstPipeline
+        GstFileSrc
+      GstBaseSink
+        GstFakeSink
+        GstFdSink
+        GstFileSink
+      GstFunnel
       GstInputSelector
-      GstMultiQueue
       GstOutputSelector
       GstQueue
       GstQueue2
       GstTee
       GstTypeFindElement
+      GstMultiQueue
       GstValve
-    GstIndex
-      GstFileIndex
-      GstMemIndex
-    GstPad
-    GstPadTemplate
-    GstPlugin
-    GstPluginFeature
-      GstElementFactory
-      GstIndexFactory
-      GstTypeFindFactory
-    GstRegistry
+    GstBus
     GstTask
     GstTaskPool
+    GstClock
+    GstPlugin
+    GstRegistry
+    GstIndex
+      GstMemIndex
+      GstFileIndex
   GstSignalObject
 GInterface
   GTypePlugin
diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml
index 10036790c..d0acd6440 100644
--- a/docs/plugins/inspect/plugin-coreelements.xml
+++ b/docs/plugins/inspect/plugin-coreelements.xml
@@ -121,6 +121,27 @@
       </pads>
     </element>
     <element>
+      <name>funnel</name>
+      <longname>Farsight Funnel pipe fitting</longname>
+      <class>Generic</class>
+      <description>N-to-1 pipe fitting</description>
+      <author>Olivier Crete &lt;olivier.crete@collabora.co.uk&gt;</author>
+      <pads>
+        <caps>
+          <name>sink%d</name>
+          <direction>sink</direction>
+          <presence>request</presence>
+          <details>ANY</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
       <name>identity</name>
       <longname>Identity</longname>
       <class>Generic</class>
diff --git a/docs/plugins/inspect/plugin-staticelements.xml b/docs/plugins/inspect/plugin-staticelements.xml
new file mode 100644
index 000000000..75b81e983
--- /dev/null
+++ b/docs/plugins/inspect/plugin-staticelements.xml
@@ -0,0 +1,12 @@
+<plugin>
+  <name>staticelements</name>  <description>core elements linked into the GStreamer library</description>  <filename></filename>  <basename></basename>  <version>0.10.29.1</version>  <license>LGPL</license>  <source>gstreamer</source>  <package>GStreamer git</package>  <origin>Unknown package origin</origin>  <elements>
+    <element>
+      <name>bin</name>      <longname>Generic bin</longname>      <class>Generic/Bin</class>      <description>Simple container object</description>      <author>Erik Walthinsen &lt;omega@cse.ogi.edu&gt;,Wim Taymans &lt;wim.taymans@gmail.com&gt;</author>      <pads>
+      </pads>
+    </element>
+    <element>
+      <name>pipeline</name>      <longname>Pipeline object</longname>      <class>Generic/Bin</class>      <description>Complete pipeline object</description>      <author>Erik Walthinsen &lt;omega@cse.ogi.edu&gt;, Wim Taymans &lt;wim@fluendo.com&gt;</author>      <pads>
+      </pads>
+    </element>
+  </elements>
+</plugin>