From 305e5c7ac3c6cebc0280de25b9736bcf058f973a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Mon, 5 Oct 2015 00:55:36 +0100
Subject: liveadder: Remove plugin, replace by compat subclass of audiomixer

New subclass with a similar behaviour as the old liveadder, but
a slightly different API as the latency is in nanoseconds, not
milliseconds. Also, the new liveadder has a effective latency that
is latency + output-buffer-duration. In practice, just setting a non-zero
latency with the new audiomixer gives you the right behavior in 99% of the
cases.
---
 docs/plugins/Makefile.am                          |  1 -
 docs/plugins/gst-plugins-bad-plugins-docs.sgml    |  1 -
 docs/plugins/gst-plugins-bad-plugins-sections.txt |  9 +-----
 docs/plugins/inspect/plugin-liveadder.xml         | 34 -----------------------
 4 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 docs/plugins/inspect/plugin-liveadder.xml

(limited to 'docs')

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index b94cf9e96..7607b558f 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -150,7 +150,6 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/geometrictransform/gstwaterripple.h \
 	$(top_srcdir)/gst/ivfparse/gstivfparse.h \
 	$(top_srcdir)/gst/jpegformat/gstjpegparse.h \
-	$(top_srcdir)/gst/liveadder/liveadder.h \
 	$(top_srcdir)/gst/mxf/mxfdemux.h \
 	$(top_srcdir)/gst/mxf/mxfmux.h \
 	$(top_srcdir)/gst/nuvdemux/gstnuvdemux.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 51278e9f5..bd25df380 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -132,7 +132,6 @@
     <xi:include href="xml/plugin-geometrictransform.xml" />
     <xi:include href="xml/plugin-gsm.xml" />
     <xi:include href="xml/plugin-jpegformat.xml" />
-    <xi:include href="xml/plugin-liveadder.xml" />
     <xi:include href="xml/plugin-mimic.xml" />
     <xi:include href="xml/plugin-mms.xml" />
     <xi:include href="xml/plugin-modplug.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 5e869c820..a289e226d 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -720,15 +720,7 @@ gst_jpeg_parse_get_type
 GstLiveAdder
 <SUBSECTION Standard>
 GstLiveAdderClass
-GST_IS_LIVE_ADDER
-GST_IS_LIVE_ADDER_CLASS
-GST_IS_MXF_DEMUX_PAD
-GST_LIVE_ADDER
-GST_LIVE_ADDER_CLASS
-GST_LIVE_ADDER_GET_CLASS
 GST_TYPE_LIVE_ADDER
-GstLiveAdderFormat
-GstLiveAdderFunction
 gst_live_adder_get_type
 </SECTION>
 
@@ -1008,6 +1000,7 @@ GST_MXF_DEMUX
 GST_MXF_DEMUX_CLASS
 GST_TYPE_MXF_DEMUX
 gst_mxf_demux_get_type
+GST_IS_MXF_DEMUX_PAD
 </SECTION>
 
 <SECTION>
diff --git a/docs/plugins/inspect/plugin-liveadder.xml b/docs/plugins/inspect/plugin-liveadder.xml
deleted file mode 100644
index b48d0602d..000000000
--- a/docs/plugins/inspect/plugin-liveadder.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
-  <name>liveadder</name>
-  <description>Adds multiple live discontinuous streams</description>
-  <filename>../../gst/liveadder/.libs/libgstliveadder.so</filename>
-  <basename>libgstliveadder.so</basename>
-  <version>1.6.0</version>
-  <license>LGPL</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins source release</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>liveadder</name>
-      <longname>Live Adder element</longname>
-      <class>Generic/Audio</class>
-      <description>Mixes live/discontinuous audio streams</description>
-      <author>Olivier Crete &lt;olivier.crete@collabora.co.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>sink_%u</name>
-          <direction>sink</direction>
-          <presence>request</presence>
-          <details>audio/x-raw, format=(string){ S8, U8, S16LE, U16LE, S32LE, U32LE, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw, format=(string){ S8, U8, S16LE, U16LE, S32LE, U32LE, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
-- 
cgit v1.2.1