Add goom2k1 into the docs.

Original commit message from CVS:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/inspect/plugin-goom.xml:
* docs/plugins/inspect/plugin-goom2k1.xml:
* gst/goom/gstgoom.c:
* gst/goom2k1/gstgoom.c:
Add goom2k1 into the docs.

diff --git a/ChangeLog b/ChangeLog
index 690b1ff..1306b23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-11  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+       * docs/plugins/gst-plugins-good-plugins-sections.txt:
+       * docs/plugins/inspect/plugin-goom.xml:
+       * docs/plugins/inspect/plugin-goom2k1.xml:
+       * gst/goom/gstgoom.c:
+       * gst/goom2k1/gstgoom.c:
+       Add goom2k1 into the docs.
+
 2008-05-08  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        Based on patch by: Wouter Cloetens  <wouter at mind be>

diff --git a/common b/common
index ba3dd28..dbf8f3a 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ba3dd2882b1611f8115f9664e3b85e1fd956b53d
+Subproject commit dbf8f3aeceb6e57de097951a670cd853b4886ad8

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 81fb5ce..899f41b 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -44,6 +44,7 @@
     <xi:include href="xml/element-gamma.xml" />
     <xi:include href="xml/element-gdkpixbufsink.xml" />
     <xi:include href="xml/element-goom.xml" />
+    <xi:include href="xml/element-goom2k1.xml" />
     <xi:include href="xml/element-halaudiosink.xml" />
     <xi:include href="xml/element-halaudiosrc.xml" />
     <xi:include href="xml/element-icydemux.xml" />
@@ -119,6 +120,7 @@
     <xi:include href="xml/plugin-gconfelements.xml" />
     <xi:include href="xml/plugin-gdkpixbuf.xml" />
     <xi:include href="xml/plugin-goom.xml" />
+    <xi:include href="xml/plugin-goom2k1.xml" />
     <xi:include href="xml/plugin-halelements.xml" />
     <xi:include href="xml/plugin-icydemux.xml" />
     <xi:include href="xml/plugin-id3demux.xml" />

diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 0d609a0..1e66205 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -510,6 +510,20 @@ gst_goom_get_type
 </SECTION>
 
 <SECTION>
+<FILE>element-goom2k1</FILE>
+<TITLE>goom2k1</TITLE>
+GstGoom
+<SUBSECTION Standard>
+GstGoomClass
+GOOM_SAMPLES
+GST_GOOM
+GST_IS_GOOM
+GST_TYPE_GOOM
+GST_GOOM_CLASS
+GST_IS_GOOM_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>element-halaudiosink</FILE>
 <TITLE>halaudiosink</TITLE>
 GstHalAudioSink

diff --git a/docs/plugins/inspect/plugin-goom.xml b/docs/plugins/inspect/plugin-goom.xml
index 0a37de7..86c5654 100644 (file)
--- a/docs/plugins/inspect/plugin-goom.xml
+++ b/docs/plugins/inspect/plugin-goom.xml
@@ -17,17 +17,17 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
       <pads>
         <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }</details>
-        </caps>
-        <caps>
           <name>src</name>
           <direction>source</direction>
           <presence>always</presence>
           <details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
         </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }</details>
+        </caps>
       </pads>
     </element>
   </elements>

diff --git a/docs/plugins/inspect/plugin-goom2k1.xml b/docs/plugins/inspect/plugin-goom2k1.xml
new file mode 100644 (file)
index 0000000..1f939d5
--- /dev/null
+++ b/docs/plugins/inspect/plugin-goom2k1.xml
@@ -0,0 +1,34 @@
+<plugin>
+  <name>goom2k1</name>
+  <description>GOOM 2k1 visualization filter</description>
+  <filename>../../gst/goom2k1/.libs/libgstgoom2k1.so</filename>
+  <basename>libgstgoom2k1.so</basename>
+  <version>0.10.8.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-good</source>
+  <package>GStreamer Good Plug-ins CVS/prerelease</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>goom2k1</name>
+      <longname>GOOM: what a GOOM! 2k1 edition</longname>
+      <class>Visualization</class>
+      <description>Takes frames of data and outputs video frames using the GOOM 2k1 filter</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+        </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file

diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index e7c43d9..287d177 100644 (file)
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -25,7 +25,7 @@
  * <refsect2>
  * <para>
  * Goom is an audio visualisation element. It creates warping structures
- * based on the incomming audio signal.
+ * based on the incoming audio signal.
  * </para>
  * <title>Example launch line</title>
  * <para>

diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c
index 933badc..bc6da3c 100644 (file)
--- a/gst/goom2k1/gstgoom.c
+++ b/gst/goom2k1/gstgoom.c
@@ -19,13 +19,14 @@
  */
 
 /**
- * SECTION:element-goom
- * @see_also: synaesthesia
+ * SECTION:element-goom2k1
+ * @see_also: goom, synaesthesia
  *
  * <refsect2>
  * <para>
- * Goom is an audio visualisation element. It creates warping structures
- * based on the incomming audio signal.
+ * Goom2k1 is an audio visualisation element. It creates warping structures
+ * based on the incomming audio signal. Goom2k1 is the older version of the
+ * visualisation. Also available is goom2k4, with a different look.
  * </para>
  * <title>Example launch line</title>
  * <para>