From f4802618151cc5bfd75777727d3ea92b59495da2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 25 Dec 2018 14:51:38 +0100
Subject: [PATCH] audiofx: add stereo element which was moved from -bad to
 build

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/457
---
 docs/plugins/Makefile.am                        |  1 +
 docs/plugins/gst-plugins-good-plugins.args      | 19 +++++++++++++++++++
 docs/plugins/gst-plugins-good-plugins.hierarchy |  1 +
 docs/plugins/inspect/plugin-audiofx.xml         | 21 +++++++++++++++++++++
 gst/audiofx/Makefile.am                         |  4 +++-
 gst/audiofx/audiofx.c                           |  4 +++-
 gst/audiofx/gststereo.c                         | 13 -------------
 gst/audiofx/meson.build                         |  3 ++-
 8 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 942a0bd..5257826 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -99,6 +99,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/audiofx/audiowsinclimit.h \
 	$(top_srcdir)/gst/audiofx/audiofirfilter.h \
 	$(top_srcdir)/gst/audiofx/gstscaletempo.h \
+	$(top_srcdir)/gst/audiofx/gststereo.h \
 	$(top_srcdir)/gst/audioparsers/gstaacparse.h \
 	$(top_srcdir)/gst/audioparsers/gstac3parse.h \
 	$(top_srcdir)/gst/audioparsers/gstamrparse.h \
diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args
index 0e2d011..1671229 100644
--- a/docs/plugins/gst-plugins-good-plugins.args
+++ b/docs/plugins/gst-plugins-good-plugins.args
@@ -24938,3 +24938,22 @@
 <DEFAULT>0</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>GstStereo::active</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>active</NICK>
+<BLURB>active.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstStereo::stereo</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>stereo</NICK>
+<BLURB>stereo.</BLURB>
+<DEFAULT>0.1</DEFAULT>
+</ARG>
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index 1f947d4..f6e7d23 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -118,6 +118,7 @@ GObject
               GstIirEqualizer3Bands
               GstIirEqualizerNBands
             GstSpectrum
+            GstStereo
           GstAudioPanorama
           GstBreakMyData
           GstCapsSetter
diff --git a/docs/plugins/inspect/plugin-audiofx.xml b/docs/plugins/inspect/plugin-audiofx.xml
index 8662390..dbbe6c2 100644
--- a/docs/plugins/inspect/plugin-audiofx.xml
+++ b/docs/plugins/inspect/plugin-audiofx.xml
@@ -282,5 +282,26 @@
         </caps>
       </pads>
     </element>
+    <element>
+      <name>stereo</name>
+      <longname>Stereo effect</longname>
+      <class>Filter/Effect/Audio</class>
+      <description>Muck with the stereo signal to enhance its &apos;stereo-ness&apos;</description>
+      <author>Erik Walthinsen &lt;omega@cse.ogi.edu&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-raw, format=(string)S16LE, rate=(int)[ 1, 2147483647 ], channels=(int)2</details>
+        </caps>
+      </pads>
+    </element>
   </elements>
 </plugin>
\ No newline at end of file
diff --git a/gst/audiofx/Makefile.am b/gst/audiofx/Makefile.am
index 13ee7d9..793b8de 100644
--- a/gst/audiofx/Makefile.am
+++ b/gst/audiofx/Makefile.am
@@ -24,7 +24,8 @@ libgstaudiofx_la_SOURCES = audiofx.c\
 	audiowsinclimit.c \
 	audiofirfilter.c \
 	audioecho.c \
-	gstscaletempo.c
+	gstscaletempo.c \
+	gststereo.c
 nodist_libgstaudiofx_la_SOURCES = $(ORC_NODIST_SOURCES)
 
 # flags used to compile this plugin
@@ -57,4 +58,5 @@ noinst_HEADERS = audiopanorama.h \
 	audiofirfilter.h \
 	audioecho.h \
 	gstscaletempo.h \
+	gststereo.h \
 	math_compat.h
diff --git a/gst/audiofx/audiofx.c b/gst/audiofx/audiofx.c
index dbddabe..b44a622 100644
--- a/gst/audiofx/audiofx.c
+++ b/gst/audiofx/audiofx.c
@@ -37,6 +37,7 @@
 #include "audiofirfilter.h"
 #include "audioecho.h"
 #include "gstscaletempo.h"
+#include "gststereo.h"
 
 /* entry point to initialize the plug-in
  * initialize the plug-in itself
@@ -71,7 +72,8 @@ plugin_init (GstPlugin * plugin)
       gst_element_register (plugin, "audioecho", GST_RANK_NONE,
           GST_TYPE_AUDIO_ECHO) &&
       gst_element_register (plugin, "scaletempo", GST_RANK_NONE,
-          GST_TYPE_SCALETEMPO));
+          GST_TYPE_SCALETEMPO) &&
+      gst_element_register (plugin, "stereo", GST_RANK_NONE, GST_TYPE_STEREO));
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/gst/audiofx/gststereo.c b/gst/audiofx/gststereo.c
index 95ca352..1a1ef75 100644
--- a/gst/audiofx/gststereo.c
+++ b/gst/audiofx/gststereo.c
@@ -199,16 +199,3 @@ gst_stereo_get_property (GObject * object, guint prop_id, GValue * value,
       break;
   }
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "stereo", GST_RANK_NONE,
-      GST_TYPE_STEREO);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    stereo,
-    "Muck with the stereo signal, enhance its 'stereo-ness'",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/audiofx/meson.build b/gst/audiofx/meson.build
index 45f0536..b3460a6 100644
--- a/gst/audiofx/meson.build
+++ b/gst/audiofx/meson.build
@@ -14,7 +14,8 @@ audiofx_sources = [
   'audiowsinclimit.c',
   'audiofirfilter.c',
   'audioecho.c',
-  'gstscaletempo.c'
+  'gstscaletempo.c',
+  'gststereo.c'
 ]
 
 orcsrc = 'audiopanoramaorc'
-- 
2.7.4