[0.11] gstreamer: docs: remove collectpads from docs, fix build

Tim Müller tpm at kemper.freedesktop.org
Thu Jan 26 02:49:13 PST 2012


Module: gstreamer
Branch: 0.11
Commit: ca697b61f38b437b7c356c952b7ad9e2f586c4f4
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=ca697b61f38b437b7c356c952b7ad9e2f586c4f4

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Thu Jan 26 10:48:02 2012 +0000

docs: remove collectpads from docs, fix build

---

 docs/libs/gstreamer-libs-docs.sgml    |    1 -
 docs/libs/gstreamer-libs-sections.txt |   46 ---------------------------------
 docs/libs/gstreamer-libs.types        |    4 +-
 tests/check/libs/.gitignore           |    2 +-
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml
index 97387d2..502bd82 100644
--- a/docs/libs/gstreamer-libs-docs.sgml
+++ b/docs/libs/gstreamer-libs-docs.sgml
@@ -43,7 +43,6 @@
       <xi:include href="xml/gstbitreader.xml" />
       <xi:include href="xml/gstbytereader.xml" />
       <xi:include href="xml/gstbytewriter.xml" />
-      <xi:include href="xml/gstcollectpads.xml" />
       <xi:include href="xml/gstcollectpads2.xml" />
       <xi:include href="xml/gsttypefindhelper.xml" />
     </chapter>
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 6311372..c900280 100644
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -618,52 +618,6 @@ GST_BYTE_WRITER
 </SECTION>
 
 <SECTION>
-<FILE>gstcollectpads</FILE>
-<TITLE>GstCollectPads</TITLE>
-<INCLUDE>gst/base/gstcollectpads.h</INCLUDE>
-GstCollectData
-GstCollectPads
-GstCollectPadsFunction
-GstCollectPadsClipFunction
-GstCollectDataDestroyNotify
-gst_collect_pads_new
-gst_collect_pads_set_function
-gst_collect_pads_set_clip_function
-gst_collect_pads_add_pad
-gst_collect_pads_remove_pad
-gst_collect_pads_is_active
-gst_collect_pads_collect
-gst_collect_pads_collect_range
-gst_collect_pads_start
-gst_collect_pads_stop
-gst_collect_pads_set_flushing
-gst_collect_pads_peek
-gst_collect_pads_pop
-gst_collect_pads_available
-gst_collect_pads_read_buffer
-gst_collect_pads_take_buffer
-gst_collect_pads_flush
-<SUBSECTION Standard>
-GstCollectPadsClass
-GstCollectPadsPrivate
-GST_COLLECT_PADS
-GST_IS_COLLECT_PADS
-GST_TYPE_COLLECT_PADS
-GST_COLLECT_PADS_CLASS
-GST_IS_COLLECT_PADS_CLASS
-GST_COLLECT_PADS_GET_CLASS
-<SUBSECTION Private>
-gst_collect_pads_get_type
-GST_COLLECT_PADS_GET_PAD_LOCK
-GST_COLLECT_PADS_PAD_LOCK
-GST_COLLECT_PADS_PAD_UNLOCK
-GST_COLLECT_PADS_BROADCAST
-GST_COLLECT_PADS_GET_COND
-GST_COLLECT_PADS_SIGNAL
-GST_COLLECT_PADS_WAIT
-</SECTION>
-
-<SECTION>
 <FILE>gstcollectpads2</FILE>
 <TITLE>GstCollectPads2</TITLE>
 <INCLUDE>gst/base/gstcollectpads2.h</INCLUDE>
diff --git a/docs/libs/gstreamer-libs.types b/docs/libs/gstreamer-libs.types
index a75d55b..cfb552a 100644
--- a/docs/libs/gstreamer-libs.types
+++ b/docs/libs/gstreamer-libs.types
@@ -6,14 +6,14 @@
 #include <gst/base/gstbasesrc.h>
 #include <gst/base/gstbasesink.h>
 #include <gst/base/gstbasetransform.h>
-#include <gst/base/gstcollectpads.h>
+#include <gst/base/gstcollectpads2.h>
 #include <gst/base/gstpushsrc.h>
 
 gst_adapter_get_type
 gst_base_src_get_type
 gst_base_sink_get_type
 gst_base_transform_get_type
-gst_collect_pads_get_type
+gst_collect_pads2_get_type
 gst_push_src_get_type
 
 % controller
diff --git a/tests/check/libs/.gitignore b/tests/check/libs/.gitignore
index 8eb96b4..2fea60e 100644
--- a/tests/check/libs/.gitignore
+++ b/tests/check/libs/.gitignore
@@ -6,7 +6,7 @@ bitreader
 bytereader
 bytewriter
 gdp
-collectpads
+collectpads2
 controller
 gstlibscpp
 gstnetclientclock



More information about the gstreamer-commits mailing list