controller: port to new controller location and api

6 files changed, 5 insertions, 16 deletions

diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index 353ec5ebb..3d9695338 100644
--- a/ext/ladspa/Makefile.am
+++ b/ext/ladspa/Makefile.am
@@ -4,11 +4,11 @@ libgstladspa_la_SOURCES = gstladspa.c
 libgstladspa_la_CFLAGS = \
 	-I$(top_srcdir)/gst-libs \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LRDF_CFLAGS)
+	$(GST_CFLAGS) $(LRDF_CFLAGS)
 libgstladspa_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-	$(GST_CONTROLLER_LIBS) $(LIBM) $(LRDF_LIBS)
+	$(LIBM) $(LRDF_LIBS)
 libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 52a8d5b2d..da03e6feb 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <math.h>
 #include <gst/audio/audio.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstladspa.h"
 #include <ladspa.h>             /* main ladspa sdk include file */
@@ -864,9 +863,6 @@ plugin_init (GstPlugin * plugin)
   GST_DEBUG_CATEGORY_INIT (ladspa_debug, "ladspa",
       GST_DEBUG_FG_GREEN | GST_DEBUG_BG_BLACK | GST_DEBUG_BOLD, "LADSPA");
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   gst_plugin_add_dependency_simple (plugin,
       "LADSPA_PATH",
       GST_LADSPA_DEFAULT_PATH, NULL, GST_PLUGIN_DEPENDENCY_FLAG_NONE);
diff --git a/ext/lv2/Makefile.am b/ext/lv2/Makefile.am
index 7b6ac4e52..76333e79e 100644
--- a/ext/lv2/Makefile.am
+++ b/ext/lv2/Makefile.am
@@ -4,11 +4,11 @@ libgstlv2_la_SOURCES = gstlv2.c
 libgstlv2_la_CFLAGS = \
 	-I$(top_srcdir)/gst-libs \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(SLV2_CFLAGS)
+	$(GST_CFLAGS) $(SLV2_CFLAGS)
 libgstlv2_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-	$(GST_CONTROLLER_LIBS) $(LIBM) $(SLV2_LIBS)
+	$(LIBM) $(SLV2_LIBS)
 libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlv2_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
index f31050fc6..6a4fcb1a2 100644
--- a/ext/lv2/gstlv2.c
+++ b/ext/lv2/gstlv2.c
@@ -39,7 +39,6 @@
 #include <math.h>
 #include <glib.h>
 #include <gst/audio/audio.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/audio/multichannel.h>
 
 #include "gstlv2.h"
@@ -894,9 +893,6 @@ plugin_init (GstPlugin * plugin)
   side_left_role = slv2_value_new_uri (world, NS_PG "sideLeftChannel");
   side_right_role = slv2_value_new_uri (world, NS_PG "sideRightChannel");
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   gst_plugin_add_dependency_simple (plugin,
       "LV2_PATH", GST_LV2_DEFAULT_PATH, NULL, GST_PLUGIN_DEPENDENCY_FLAG_NONE);
 
diff --git a/ext/soundtouch/Makefile.am b/ext/soundtouch/Makefile.am
index 74a5516d4..07832a7bc 100644
--- a/ext/soundtouch/Makefile.am
+++ b/ext/soundtouch/Makefile.am
@@ -7,7 +7,7 @@ libgstsoundtouch_la_SOURCES = \
 
 libgstsoundtouch_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUNDTOUCH_CFLAGS)
 libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SOUNDTOUCH_CFLAGS)
-libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM)
+libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM)
 libgstsoundtouch_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsoundtouch_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/ext/soundtouch/plugin.c b/ext/soundtouch/plugin.c
index 5e8cb1563..77cc30492 100644
--- a/ext/soundtouch/plugin.c
+++ b/ext/soundtouch/plugin.c
@@ -22,15 +22,12 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include "gstpitch.hh"
 #include "gstbpmdetect.hh"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gst_controller_init (NULL, NULL);
-
   return gst_element_register (plugin, "pitch", GST_RANK_NONE, GST_TYPE_PITCH)
       && gst_element_register (plugin, "bpmdetect", GST_RANK_NONE,
       GST_TYPE_BPM_DETECT);