From 30d24e1d557b84c5e5e905eb6c12adcae0ee27b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 31 Dec 2010 00:48:55 +0000 Subject: [PATCH] docs: add input-selector and output-selector to docs --- docs/plugins/Makefile.am | 2 ++ docs/plugins/gstreamer-plugins-docs.sgml | 2 ++ docs/plugins/gstreamer-plugins-sections.txt | 34 +++++++++++++++++++ docs/plugins/gstreamer-plugins.args | 50 ++++++++++++++++++++++++++++ docs/plugins/gstreamer-plugins.hierarchy | 2 ++ docs/plugins/gstreamer-plugins.signals | 17 ++++++++++ docs/plugins/inspect/plugin-coreelements.xml | 42 +++++++++++++++++++++++ 7 files changed, 149 insertions(+) diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index bfd4fd6..0e44c57 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -86,7 +86,9 @@ EXTRA_HFILES = \ $(top_srcdir)/plugins/elements/gstfilesrc.h \ $(top_srcdir)/plugins/elements/gstfilesink.h \ $(top_srcdir)/plugins/elements/gstidentity.h \ + $(top_srcdir)/plugins/elements/gstinputselector.h \ $(top_srcdir)/plugins/elements/gstmultiqueue.h \ + $(top_srcdir)/plugins/elements/gstoutputselector.h \ $(top_srcdir)/plugins/elements/gstqueue.h \ $(top_srcdir)/plugins/elements/gstqueue2.h \ $(top_srcdir)/plugins/elements/gsttypefindelement.h \ diff --git a/docs/plugins/gstreamer-plugins-docs.sgml b/docs/plugins/gstreamer-plugins-docs.sgml index 89a707c..3d6a15c 100644 --- a/docs/plugins/gstreamer-plugins-docs.sgml +++ b/docs/plugins/gstreamer-plugins-docs.sgml @@ -25,7 +25,9 @@ + + diff --git a/docs/plugins/gstreamer-plugins-sections.txt b/docs/plugins/gstreamer-plugins-sections.txt index 347921a..1854112 100644 --- a/docs/plugins/gstreamer-plugins-sections.txt +++ b/docs/plugins/gstreamer-plugins-sections.txt @@ -126,6 +126,26 @@ gst_identity_get_type
+element-input-selector +input-selector +GstInputSelector + +GstInputSelectorClass +GST_INPUT_SELECTOR +GST_INPUT_SELECTOR_CLASS +GST_IS_INPUT_SELECTOR +GST_IS_INPUT_SELECTOR_CLASS +GST_TYPE_INPUT_SELECTOR +gst_input_selector_get_type +GST_INPUT_SELECTOR_BROADCAST +GST_INPUT_SELECTOR_GET_COND +GST_INPUT_SELECTOR_GET_LOCK +GST_INPUT_SELECTOR_LOCK +GST_INPUT_SELECTOR_UNLOCK +GST_INPUT_SELECTOR_WAIT +
+ +
element-queue queue GstQueue @@ -176,6 +196,20 @@ gst_multi_queue_get_type
+element-output-selector +output-selector +GstOutputSelector + +GstOutputSelectorClass +GST_OUTPUT_SELECTOR +GST_OUTPUT_SELECTOR_CLASS +GST_IS_OUTPUT_SELECTOR +GST_IS_OUTPUT_SELECTOR_CLASS +GST_TYPE_OUTPUT_SELECTOR +gst_output_selector_get_type +
+ +
element-typefind typefind GstTypeFindElement diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args index 1338df5..d4d18e7 100644 --- a/docs/plugins/gstreamer-plugins.args +++ b/docs/plugins/gstreamer-plugins.args @@ -1008,3 +1008,53 @@ FALSE + +GstOutputSelector::active-pad +GstPad* + +rw +Active pad +Currently active src pad. + + + + +GstOutputSelector::resend-latest +gboolean + +rw +Resend latest buffer +Resend latest buffer after a switch to a new pad. +FALSE + + + +GstInputSelector::active-pad +GstPad* + +rw +Active pad +The currently active sink pad. + + + + +GstInputSelector::n-pads +guint + +r +Number of Pads +The number of sink pads. +0 + + + +GstInputSelector::select-all +gboolean + +rw +Select all mode +Forwards data from all input pads. +FALSE + + diff --git a/docs/plugins/gstreamer-plugins.hierarchy b/docs/plugins/gstreamer-plugins.hierarchy index 21c2ed7..d6a33d1 100644 --- a/docs/plugins/gstreamer-plugins.hierarchy +++ b/docs/plugins/gstreamer-plugins.hierarchy @@ -17,7 +17,9 @@ GObject GstIdentity GstBin GstPipeline + GstInputSelector GstMultiQueue + GstOutputSelector GstQueue GstQueue2 GstTee diff --git a/docs/plugins/gstreamer-plugins.signals b/docs/plugins/gstreamer-plugins.signals index 265feee..636d2e1 100644 --- a/docs/plugins/gstreamer-plugins.signals +++ b/docs/plugins/gstreamer-plugins.signals @@ -107,3 +107,20 @@ GstMultiQueue *gstmultiqueue GstMultiQueue *gstmultiqueue + +GstInputSelector::block +gint64 +la +GstInputSelector *gstinputselector + + + +GstInputSelector::switch +void +l +GstInputSelector *gstinputselector +GstPad *arg1 +gint64 arg2 +gint64 arg3 + + diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index 9037730..e15c208 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -142,6 +142,27 @@ + input-selector + Input selector + Generic + N-to-1 input stream selectoring + Julien Moutte <julien@moutte.net>, Jan Schmidt <thaytan@mad.scientist.com>, Wim Taymans <wim.taymans@gmail.com> + + + sink%d + sink + request +
ANY
+
+ + src + source + always +
ANY
+
+
+
+ multiqueue MultiQueue Generic @@ -163,6 +184,27 @@ + output-selector + Output selector + Generic + 1-to-N output stream selector + Stefan Kost <stefan.kost@nokia.com> + + + sink + sink + always +
ANY
+
+ + src%d + source + request +
ANY
+
+
+
+ queue Queue Generic -- 2.7.4