diff --git a/ChangeLog b/ChangeLog index 690b1ff790..1306b233bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-05-11 Jan Schmidt + + * 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 Based on patch by: Wouter Cloetens diff --git a/common b/common index ba3dd2882b..dbf8f3aece 160000 --- 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 81fb5ce567..899f41b5b9 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -44,6 +44,7 @@ + @@ -119,6 +120,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 0d609a04c3..1e6620558f 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -509,6 +509,20 @@ GST_IS_GOOM_CLASS gst_goom_get_type +
+element-goom2k1 +goom2k1 +GstGoom + +GstGoomClass +GOOM_SAMPLES +GST_GOOM +GST_IS_GOOM +GST_TYPE_GOOM +GST_GOOM_CLASS +GST_IS_GOOM_CLASS +
+
element-halaudiosink halaudiosink diff --git a/docs/plugins/inspect/plugin-goom.xml b/docs/plugins/inspect/plugin-goom.xml index 0a37de71a0..86c5654117 100644 --- a/docs/plugins/inspect/plugin-goom.xml +++ b/docs/plugins/inspect/plugin-goom.xml @@ -16,18 +16,18 @@ Takes frames of data and outputs video frames using the GOOM filter Wim Taymans <wim@fluendo.com> - - sink - sink - always -
audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }
-
src source always
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 ]
+ + sink + sink + always +
audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }
+
diff --git a/docs/plugins/inspect/plugin-goom2k1.xml b/docs/plugins/inspect/plugin-goom2k1.xml new file mode 100644 index 0000000000..1f939d590e --- /dev/null +++ b/docs/plugins/inspect/plugin-goom2k1.xml @@ -0,0 +1,34 @@ + + goom2k1 + GOOM 2k1 visualization filter + ../../gst/goom2k1/.libs/libgstgoom2k1.so + libgstgoom2k1.so + 0.10.8.1 + LGPL + gst-plugins-good + GStreamer Good Plug-ins CVS/prerelease + Unknown package origin + + + goom2k1 + GOOM: what a GOOM! 2k1 edition + Visualization + Takes frames of data and outputs video frames using the GOOM 2k1 filter + Wim Taymans <wim@fluendo.com> + + + src + source + always +
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 ]
+
+ + sink + sink + always +
audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)[ 8000, 96000 ], channels=(int){ 1, 2 }
+
+
+
+
+
\ No newline at end of file diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index e7c43d9d05..287d177ac7 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -25,7 +25,7 @@ * * * Goom is an audio visualisation element. It creates warping structures - * based on the incomming audio signal. + * based on the incoming audio signal. * * Example launch line * diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c index 933badc373..bc6da3cebf 100644 --- 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 * * * - * 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. * * Example launch line *