controller: port to new controller location and api

52 files changed, 41 insertions, 119 deletions

diff --git a/ext/annodex/gstcmmldec.h b/ext/annodex/gstcmmldec.h
index 27a6c5597..b7b302de8 100644
--- a/ext/annodex/gstcmmldec.h
+++ b/ext/annodex/gstcmmldec.h
@@ -26,7 +26,6 @@
 
 #include <gst/gst.h>
 #include <gst/gstformat.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstcmmlparser.h"
 
diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am
index dcd88ae04..b17fb41b1 100644
--- a/gst/alpha/Makefile.am
+++ b/gst/alpha/Makefile.am
@@ -2,9 +2,9 @@ plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la
 
 libgstalpha_la_SOURCES = gstalpha.c
 libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-	$(GST_CONTROLLER_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
+	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index 3b6ce3ae9..0edaf6d2b 100644
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -2570,7 +2570,7 @@ gst_alpha_before_transform (GstBaseTransform * btrans, GstBuffer * buf)
       GST_BUFFER_TIMESTAMP (buf));
   GST_LOG ("Got stream time of %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp));
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (alpha), timestamp);
+    gst_object_sync_values (GST_OBJECT (alpha), timestamp);
 }
 
 static GstFlowReturn
@@ -2624,8 +2624,6 @@ invalid_out:
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gst_controller_init (NULL, NULL);
-
   return gst_element_register (plugin, "alpha", GST_RANK_NONE, GST_TYPE_ALPHA);
 }
 
diff --git a/gst/alpha/gstalpha.h b/gst/alpha/gstalpha.h
index 6cae928ca..3e15c14a9 100644
--- a/gst/alpha/gstalpha.h
+++ b/gst/alpha/gstalpha.h
@@ -26,7 +26,6 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/audiofx/Makefile.am b/gst/audiofx/Makefile.am
index c943e20f2..b7f22d693 100644
--- a/gst/audiofx/Makefile.am
+++ b/gst/audiofx/Makefile.am
@@ -22,11 +22,9 @@ libgstaudiofx_la_SOURCES = audiofx.c\
 # flags used to compile this plugin
 libgstaudiofx_la_CFLAGS = $(GST_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS)
 libgstaudiofx_la_LIBADD = $(GST_LIBS) \
 	$(GST_BASE_LIBS) \
-	$(GST_CONTROLLER_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	-lgstaudio-$(GST_MAJORMINOR) \
 	-lgstfft-$(GST_MAJORMINOR) \
diff --git a/gst/audiofx/audioamplify.c b/gst/audiofx/audioamplify.c
index 0a8627dc2..f8dbb21d6 100644
--- a/gst/audiofx/audioamplify.c
+++ b/gst/audiofx/audioamplify.c
@@ -43,7 +43,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audioamplify.h"
 
@@ -459,7 +458,7 @@ gst_audio_amplify_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (gst_base_transform_is_passthrough (base) ||
       G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))
diff --git a/gst/audiofx/audiochebband.c b/gst/audiofx/audiochebband.c
index 10220d390..caa40cef0 100644
--- a/gst/audiofx/audiochebband.c
+++ b/gst/audiofx/audiochebband.c
@@ -74,7 +74,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include <math.h>
 
diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
index ef5fc1ff0..8905cbfff 100644
--- a/gst/audiofx/audiocheblimit.c
+++ b/gst/audiofx/audiocheblimit.c
@@ -70,7 +70,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include <math.h>
 
diff --git a/gst/audiofx/audiodynamic.c b/gst/audiofx/audiodynamic.c
index 2fdf7b390..564dd7f2d 100644
--- a/gst/audiofx/audiodynamic.c
+++ b/gst/audiofx/audiodynamic.c
@@ -46,7 +46,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiodynamic.h"
 
@@ -702,7 +701,7 @@ gst_audio_dynamic_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (gst_base_transform_is_passthrough (base) ||
       G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))
diff --git a/gst/audiofx/audioecho.c b/gst/audiofx/audioecho.c
index a93e40a8f..38cafd244 100644
--- a/gst/audiofx/audioecho.c
+++ b/gst/audiofx/audioecho.c
@@ -50,7 +50,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audioecho.h"
 
@@ -370,7 +369,7 @@ gst_audio_echo_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (self), stream_time);
+    gst_object_sync_values (GST_OBJECT (self), stream_time);
 
   if (self->buffer == NULL) {
     guint bpf, rate;
diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
index 7d6d77a69..414768920 100644
--- a/gst/audiofx/audiofirfilter.c
+++ b/gst/audiofx/audiofirfilter.c
@@ -53,7 +53,6 @@
 #include <math.h>
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiofirfilter.h"
 
diff --git a/gst/audiofx/audiofx.c b/gst/audiofx/audiofx.c
index a268724d5..098e44258 100644
--- a/gst/audiofx/audiofx.c
+++ b/gst/audiofx/audiofx.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiopanorama.h"
 #include "audioinvert.h"
@@ -46,9 +45,6 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   return (gst_element_register (plugin, "audiopanorama", GST_RANK_NONE,
           GST_TYPE_AUDIO_PANORAMA) &&
       gst_element_register (plugin, "audioinvert", GST_RANK_NONE,
diff --git a/gst/audiofx/audiofxbasefirfilter.c b/gst/audiofx/audiofxbasefirfilter.c
index 6eb90205c..014de0e76 100644
--- a/gst/audiofx/audiofxbasefirfilter.c
+++ b/gst/audiofx/audiofxbasefirfilter.c
@@ -30,7 +30,6 @@
 #include <math.h>
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiofxbasefirfilter.h"
 
@@ -829,7 +828,7 @@ gst_audio_fx_base_fir_filter_transform (GstBaseTransform * base,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (self), stream_time);
+    gst_object_sync_values (GST_OBJECT (self), stream_time);
 
   g_return_val_if_fail (self->kernel != NULL, GST_FLOW_ERROR);
   g_return_val_if_fail (channels != 0, GST_FLOW_ERROR);
diff --git a/gst/audiofx/audiofxbaseiirfilter.c b/gst/audiofx/audiofxbaseiirfilter.c
index 7afb7d0ba..0b8c0883d 100644
--- a/gst/audiofx/audiofxbaseiirfilter.c
+++ b/gst/audiofx/audiofxbaseiirfilter.c
@@ -26,7 +26,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include <math.h>
 
@@ -364,7 +363,7 @@ gst_audio_fx_base_iir_filter_transform_ip (GstBaseTransform * base,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (gst_base_transform_is_passthrough (base))
     return GST_FLOW_OK;
diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
index 761606a24..f411d8871 100644
--- a/gst/audiofx/audioiirfilter.c
+++ b/gst/audiofx/audioiirfilter.c
@@ -49,7 +49,6 @@
 #include <math.h>
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audioiirfilter.h"
 
diff --git a/gst/audiofx/audioinvert.c b/gst/audiofx/audioinvert.c
index 56a2d0bc1..dc61b2663 100644
--- a/gst/audiofx/audioinvert.c
+++ b/gst/audiofx/audioinvert.c
@@ -44,7 +44,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audioinvert.h"
 
@@ -239,7 +238,7 @@ gst_audio_invert_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (gst_base_transform_is_passthrough (base) ||
       G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))
diff --git a/gst/audiofx/audiokaraoke.c b/gst/audiofx/audiokaraoke.c
index d79686da5..4d09eed62 100644
--- a/gst/audiofx/audiokaraoke.c
+++ b/gst/audiofx/audiokaraoke.c
@@ -42,7 +42,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiokaraoke.h"
 
@@ -341,7 +340,7 @@ gst_audio_karaoke_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (gst_base_transform_is_passthrough (base) ||
       G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))
diff --git a/gst/audiofx/audiopanorama.c b/gst/audiofx/audiopanorama.c
index 5875a5215..133bb77d3 100644
--- a/gst/audiofx/audiopanorama.c
+++ b/gst/audiofx/audiopanorama.c
@@ -42,7 +42,6 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiopanorama.h"
 
@@ -630,7 +629,7 @@ gst_audio_panorama_transform (GstBaseTransform * base, GstBuffer * inbuf,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   indata = gst_buffer_map (inbuf, &insize, NULL, GST_MAP_READ);
   outdata = gst_buffer_map (outbuf, &outsize, NULL, GST_MAP_WRITE);
diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c
index 3f5df1244..3f23b561a 100644
--- a/gst/audiofx/audiowsincband.c
+++ b/gst/audiofx/audiowsincband.c
@@ -60,7 +60,6 @@
 #include <math.h>
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiowsincband.h"
 
diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c
index 2779b55b5..f13d2d020 100644
--- a/gst/audiofx/audiowsinclimit.c
+++ b/gst/audiofx/audiowsinclimit.c
@@ -60,7 +60,6 @@
 #include <math.h>
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audiowsinclimit.h"
 
diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index 2fe3152b1..fb5d3f210 100644
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -6,13 +6,11 @@ libgsteffectv_la_SOURCES = \
 	gstradioac.c gststreak.c gstripple.c
 libgsteffectv_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
 	-I$(top_srcdir)/gst/videofilter
 libgsteffectv_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
-	$(GST_CONTROLLER_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(LIBM)
diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index 2d1af9867..d3c9da5ad 100644
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -48,8 +48,6 @@
 #include "gstaging.h"
 #include "gsteffectv.h"
 
-#include <gst/controller/gstcontroller.h>
-
 static const gint dx[8] = { 1, 1, 0, -1, -1, -1, 0, 1 };
 static const gint dy[8] = { 0, -1, -1, -1, 0, 1, 1, 1 };
 
@@ -341,7 +339,7 @@ gst_agingtv_transform (GstBaseTransform * trans, GstBuffer * in,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (agingtv), stream_time);
+    gst_object_sync_values (GST_OBJECT (agingtv), stream_time);
 
   if (!gst_video_frame_map (&in_frame, &agingtv->info, in, GST_MAP_READ))
     goto invalid_in;
diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 675ee69fb..ca803b059 100644
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -53,8 +53,6 @@
 #include "gstdice.h"
 #include "gsteffectv.h"
 
-#include <gst/controller/gstcontroller.h>
-
 #define DEFAULT_CUBE_BITS   4
 #define MAX_CUBE_BITS       5
 #define MIN_CUBE_BITS       0
@@ -140,7 +138,7 @@ gst_dicetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ);
   gst_video_frame_map (&out_frame, &filter->info, out, GST_MAP_WRITE);
diff --git a/gst/effectv/gstop.c b/gst/effectv/gstop.c
index e3a6b2e82..7d89ea1c4 100644
--- a/gst/effectv/gstop.c
+++ b/gst/effectv/gstop.c
@@ -50,7 +50,6 @@
 #include "gsteffectv.h"
 
 #include <gst/video/video.h>
-#include <gst/controller/gstcontroller.h>
 
 enum
 {
@@ -219,7 +218,7 @@ gst_optv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (G_UNLIKELY (filter->opmap[0] == NULL))
     return GST_FLOW_NOT_NEGOTIATED;
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index b9bb29e9c..1c4434757 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -48,8 +48,6 @@
 #include "gstquark.h"
 #include "gsteffectv.h"
 
-#include <gst/controller/gstcontroller.h>
-
 /* number of frames of time-buffer. It should be as a configurable paramater */
 /* This number also must be 2^n just for the speed. */
 #define PLANES 16
@@ -128,7 +126,7 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (filter), timestamp);
+    gst_object_sync_values (GST_OBJECT (filter), timestamp);
 
   if (G_UNLIKELY (filter->planetable == NULL))
     return GST_FLOW_WRONG_STATE;
diff --git a/gst/effectv/gstradioac.c b/gst/effectv/gstradioac.c
index 15be67643..66d13e535 100644
--- a/gst/effectv/gstradioac.c
+++ b/gst/effectv/gstradioac.c
@@ -55,8 +55,6 @@
 #include "gstradioac.h"
 #include "gsteffectv.h"
 
-#include <gst/controller/gstcontroller.h>
-
 enum
 {
   RADIOAC_NORMAL = 0,
@@ -334,7 +332,7 @@ gst_radioactv_transform (GstBaseTransform * trans, GstBuffer * in,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
     goto invalid_in;
diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index c5d1d6395..6dce8877f 100644
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -64,8 +64,6 @@
 
 #include "gstrev.h"
 
-#include <gst/controller/gstcontroller.h>
-
 #define THE_COLOR 0xffffffff
 
 enum
@@ -141,7 +139,7 @@ gst_revtv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
     goto invalid_in;
diff --git a/gst/effectv/gstripple.c b/gst/effectv/gstripple.c
index 1c0d9cf75..8f1f64a98 100644
--- a/gst/effectv/gstripple.c
+++ b/gst/effectv/gstripple.c
@@ -52,8 +52,6 @@
 #include "gstripple.h"
 #include "gsteffectv.h"
 
-#include <gst/controller/gstcontroller.h>
-
 #define DEFAULT_MODE 0
 
 enum
@@ -328,7 +326,7 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
     goto invalid_in;
diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index 0e38275ef..44a367d17 100644
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -43,8 +43,6 @@
 
 #include "gstvertigo.h"
 
-#include <gst/controller/gstcontroller.h>
-
 #define gst_vertigotv_parent_class parent_class
 G_DEFINE_TYPE (GstVertigoTV, gst_vertigotv, GST_TYPE_VIDEO_FILTER);
 
@@ -182,7 +180,7 @@ gst_vertigotv_transform (GstBaseTransform * trans, GstBuffer * in,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (filter), stream_time);
+    gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
   if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
     goto invalid_in;
diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am
index b3b86633e..760698fcb 100644
--- a/gst/equalizer/Makefile.am
+++ b/gst/equalizer/Makefile.am
@@ -7,9 +7,9 @@ libgstequalizer_la_SOURCES = \
         gstiirequalizer10bands.c gstiirequalizer10bands.h
 
 libgstequalizer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+	$(GST_CFLAGS)
 libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
+	-lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \
 	$(GST_LIBS) $(LIBM)
 libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c
index 3872a02fa..b93d1b514 100644
--- a/gst/equalizer/gstiirequalizer.c
+++ b/gst/equalizer/gstiirequalizer.c
@@ -838,7 +838,7 @@ gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, GstBuffer * buf)
       gst_segment_to_stream_time (&btrans->segment, GST_FORMAT_TIME, timestamp);
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (equ), timestamp);
+    gst_object_sync_values (GST_OBJECT (equ), timestamp);
 
   data = gst_buffer_map (buf, &size, NULL, GST_MAP_WRITE);
   equ->process (equ, data, size, channels);
diff --git a/gst/equalizer/gstiirequalizer.h b/gst/equalizer/gstiirequalizer.h
index 2254ddc92..80af94cbf 100644
--- a/gst/equalizer/gstiirequalizer.h
+++ b/gst/equalizer/gstiirequalizer.h
@@ -23,7 +23,6 @@
 
 #include <gst/audio/gstaudiofilter.h>
 #include <gst/audio/gstringbuffer.h>
-#include <gst/controller/gstcontroller.h>
 
 typedef struct _GstIirEqualizer GstIirEqualizer;
 typedef struct _GstIirEqualizerClass GstIirEqualizerClass;
diff --git a/gst/shapewipe/Makefile.am b/gst/shapewipe/Makefile.am
index 35cf5df03..863459727 100644
--- a/gst/shapewipe/Makefile.am
+++ b/gst/shapewipe/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstshapewipe.la
 
 libgstshapewipe_la_SOURCES = gstshapewipe.c
 
-libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
+libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
 libgstshapewipe_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstshapewipe_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/shapewipe/gstshapewipe.c b/gst/shapewipe/gstshapewipe.c
index 645840f78..3c7b1539b 100644
--- a/gst/shapewipe/gstshapewipe.c
+++ b/gst/shapewipe/gstshapewipe.c
@@ -45,7 +45,6 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstshapewipe.h"
 
@@ -821,7 +820,7 @@ gst_shape_wipe_video_sink_chain (GstPad * pad, GstBuffer * buffer)
       gst_segment_to_stream_time (&self->segment, GST_FORMAT_TIME, timestamp);
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (self), timestamp);
+    gst_object_sync_values (GST_OBJECT (self), timestamp);
 
   GST_LOG_OBJECT (self,
       "Blending buffer with timestamp %" GST_TIME_FORMAT " at position %f",
@@ -1085,8 +1084,6 @@ plugin_init (GstPlugin * plugin)
   GST_DEBUG_CATEGORY_INIT (gst_shape_wipe_debug, "shapewipe", 0,
       "shapewipe element");
 
-  gst_controller_init (NULL, NULL);
-
   if (!gst_element_register (plugin, "shapewipe", GST_RANK_NONE,
           GST_TYPE_SHAPE_WIPE))
     return FALSE;
diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am
index 34bb039a0..cb517e64b 100644
--- a/gst/smpte/Makefile.am
+++ b/gst/smpte/Makefile.am
@@ -4,10 +4,9 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c gstsmptealph
 
 noinst_HEADERS = gstsmpte.h gstmask.h paint.h gstsmptealpha.h
 
-libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS)
+libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) \
-			-lgstvideo-$(GST_MAJORMINOR) \
-		        $(GST_CONTROLLER_LIBS) 
+			-lgstvideo-$(GST_MAJORMINOR) 
 libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsmpte_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/smpte/gstsmptealpha.c b/gst/smpte/gstsmptealpha.c
index 030cb5d95..b329617f3 100644
--- a/gst/smpte/gstsmptealpha.c
+++ b/gst/smpte/gstsmptealpha.c
@@ -53,8 +53,6 @@
 #endif
 #include <string.h>
 
-#include <gst/controller/gstcontroller.h>
-
 #include "gstsmptealpha.h"
 #include "paint.h"
 
@@ -441,7 +439,7 @@ gst_smpte_alpha_before_transform (GstBaseTransform * trans, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (smpte), stream_time);
+    gst_object_sync_values (GST_OBJECT (smpte), stream_time);
 }
 
 static GstFlowReturn
@@ -745,9 +743,6 @@ gst_smpte_alpha_plugin_init (GstPlugin * plugin)
   GST_DEBUG_CATEGORY_INIT (gst_smpte_alpha_debug, "smptealpha", 0,
       "SMPTE alpha effect");
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   return gst_element_register (plugin, "smptealpha", GST_RANK_NONE,
       GST_TYPE_SMPTE_ALPHA);
 }
diff --git a/gst/videobox/Makefile.am b/gst/videobox/Makefile.am
index 90dcd4b8f..21f04a079 100644
--- a/gst/videobox/Makefile.am
+++ b/gst/videobox/Makefile.am
@@ -6,12 +6,10 @@ include $(top_srcdir)/common/orc.mak
 libgstvideobox_la_SOURCES = gstvideobox.c
 nodist_libgstvideobox_la_SOURCES = $(ORC_NODIST_SOURCES)
 libgstvideobox_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-			   $(GST_CONTROLLER_CFLAGS) \
 			   $(GST_BASE_CFLAGS) \
 			   $(GST_CFLAGS) \
 			   $(ORC_CFLAGS)
 libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-			   $(GST_CONTROLLER_LIBS) \
 			   $(GST_BASE_LIBS) \
 			   $(GST_LIBS) \
 			   $(ORC_LIBS) \
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index f9854882f..2294d262f 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -64,8 +64,6 @@
 #include <math.h>
 #include <string.h>
 
-#include <gst/controller/gstcontroller.h>
-
 GST_DEBUG_CATEGORY_STATIC (videobox_debug);
 #define GST_CAT_DEFAULT videobox_debug
 
@@ -3365,7 +3363,7 @@ gst_video_box_before_transform (GstBaseTransform * trans, GstBuffer * in)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (video_box), stream_time);
+    gst_object_sync_values (GST_OBJECT (video_box), stream_time);
 }
 
 static GstFlowReturn
@@ -3389,8 +3387,6 @@ gst_video_box_transform (GstBaseTransform * trans, GstBuffer * in,
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gst_controller_init (NULL, NULL);
-
   GST_DEBUG_CATEGORY_INIT (videobox_debug, "videobox", 0,
       "Resizes a video by adding borders or cropping");
 
diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index 4838c1724..f97433890 100644
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -9,13 +9,12 @@ libgstvideofilter_la_SOURCES = plugin.c \
 			gstvideoflip.c \
 			gstvideobalance.c \
 			gstgamma.c
-libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) \
+libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) \
 			$(GST_BASE_CFLAGS) \
 			$(GST_PLUGINS_BASE_CFLAGS)
 libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 			-lgstvideo-@GST_MAJORMINOR@ \
 			-lgstinterfaces-@GST_MAJORMINOR@ \
-			$(GST_CONTROLLER_LIBS) \
 			$(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
 libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/videofilter/gstgamma.c b/gst/videofilter/gstgamma.c
index 5873b4c91..401aced45 100644
--- a/gst/videofilter/gstgamma.c
+++ b/gst/videofilter/gstgamma.c
@@ -55,7 +55,6 @@
 #include <math.h>
 
 #include <gst/video/video.h>
-#include <gst/controller/gstcontroller.h>
 
 GST_DEBUG_CATEGORY_STATIC (gamma_debug);
 #define GST_CAT_DEFAULT gamma_debug
@@ -390,7 +389,7 @@ gst_gamma_before_transform (GstBaseTransform * base, GstBuffer * outbuf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (gamma), stream_time);
+    gst_object_sync_values (GST_OBJECT (gamma), stream_time);
 }
 
 static GstFlowReturn
diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 5289c8f96..301943535 100644
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -49,7 +49,6 @@
 #include "gstvideobalance.h"
 #include <string.h>
 
-#include <gst/controller/gstcontroller.h>
 #include <gst/interfaces/colorbalance.h>
 
 GST_DEBUG_CATEGORY_STATIC (videobalance_debug);
@@ -430,7 +429,7 @@ gst_video_balance_before_transform (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (balance), stream_time);
+    gst_object_sync_values (GST_OBJECT (balance), stream_time);
 }
 
 static GstFlowReturn
diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c
index 7de57082e..dea471a78 100644
--- a/gst/videofilter/gstvideoflip.c
+++ b/gst/videofilter/gstvideoflip.c
@@ -48,7 +48,6 @@
 
 #include <string.h>
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/video/video.h>
 
 /* GstVideoFlip properties */
@@ -869,7 +868,7 @@ gst_video_flip_before_transform (GstBaseTransform * trans, GstBuffer * in)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (videoflip), stream_time);
+    gst_object_sync_values (GST_OBJECT (videoflip), stream_time);
 }
 
 static GstFlowReturn
diff --git a/gst/videofilter/plugin.c b/gst/videofilter/plugin.c
index e0fcede73..9e38173df 100644
--- a/gst/videofilter/plugin.c
+++ b/gst/videofilter/plugin.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstgamma.h"
 #include "gstvideoflip.h"
@@ -31,8 +30,6 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gst_controller_init (NULL, NULL);
-
   return (gst_element_register (plugin, "gamma", GST_RANK_NONE, GST_TYPE_GAMMA)
       && gst_element_register (plugin, "videobalance", GST_RANK_NONE,
           GST_TYPE_VIDEO_BALANCE)
diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index 0cda8261a..d92a545e4 100644
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -10,10 +10,10 @@ libgstvideomixer_la_SOURCES = \
 
 nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
 libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-@GST_MAJORMINOR@ \
-	$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(ORC_LIBS)
+	$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 4ed5a5cf6..9b89e82f5 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -76,7 +76,6 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstcollectpads.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/video/video.h>
 
 #ifdef HAVE_STDLIB_H
@@ -1444,7 +1443,7 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
 
       /* sync object properties on stream time */
       if (GST_CLOCK_TIME_IS_VALID (stream_time))
-        gst_object_sync_values (G_OBJECT (pad), stream_time);
+        gst_object_sync_values (GST_OBJECT (pad), stream_time);
 
       blend (GST_BUFFER_DATA (mixcol->buffer),
           pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha,
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index f7aead0d5..4223d7092 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -91,8 +91,6 @@
 #include "videomixer2.h"
 #include "videomixer2pad.h"
 
-#include <gst/controller/gstcontroller.h>
-
 #ifdef DISABLE_ORC
 #define orc_memset memset
 #else
@@ -869,7 +867,7 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
 
       /* sync object properties on stream time */
       if (GST_CLOCK_TIME_IS_VALID (stream_time))
-        gst_object_sync_values (G_OBJECT (pad), stream_time);
+        gst_object_sync_values (GST_OBJECT (pad), stream_time);
 
       composite (GST_BUFFER_DATA (mixcol->buffer),
           pad->xpos, pad->ypos, pad->width, pad->height, pad->alpha,
diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index b4431c17d..86f4fd2d0 100644
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -22,7 +22,6 @@ libgstvideo4linux2_la_SOURCES += gstv4l2sink.c
 
 libgstvideo4linux2_la_CFLAGS =   $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
-				 $(GST_CONTROLLER_CFLAGS) \
 				 $(GST_CFLAGS) \
 				 $(X_CFLAGS) \
 				 $(LIBV4L2_CFLAGS) \
@@ -33,7 +32,6 @@ libgstvideo4linux2_la_LIBTOOLFLAGS = --tag=disable-static
 
 libgstvideo4linux2_la_LIBADD =   $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
-				 $(GST_CONTROLLER_LIBS) \
 				 $(GST_PLUGINS_BASE_LIBS) \
 				 -lgstvideo-$(GST_MAJORMINOR) \
 				 -lgstinterfaces-$(GST_MAJORMINOR) \
diff --git a/sys/v4l2/gstv4l2.c b/sys/v4l2/gstv4l2.c
index 061adcb39..22959c663 100644
--- a/sys/v4l2/gstv4l2.c
+++ b/sys/v4l2/gstv4l2.c
@@ -28,7 +28,6 @@
 #include "gst/gst-i18n-plugin.h"
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstv4l2object.h"
 #include "gstv4l2src.h"
@@ -48,9 +47,6 @@ plugin_init (GstPlugin * plugin)
   GST_DEBUG_CATEGORY_INIT (v4l2_debug, "v4l2", 0, "V4L2 API calls");
   GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   if (!gst_element_register (plugin, "v4l2src", GST_RANK_PRIMARY,
           GST_TYPE_V4L2SRC) ||
       !gst_element_register (plugin, "v4l2sink", GST_RANK_NONE,
diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index aae6a8db4..8134818f8 100644
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -49,7 +49,6 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
-#include <gst/controller/gstcontroller.h>
 
 #include <gst/video/video.h>
 #include <gst/interfaces/propertyprobe.h>
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 9775ab9f6..06e4c7c1d 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -659,7 +659,7 @@ gst_v4l2src_start (GstBaseSrc * src)
 
   /* activate settings for first frame */
   v4l2src->ctrl_time = 0;
-  gst_object_sync_values (G_OBJECT (src), v4l2src->ctrl_time);
+  gst_object_sync_values (GST_OBJECT (src), v4l2src->ctrl_time);
 
   return TRUE;
 }
@@ -797,7 +797,7 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
      */
     v4l2src->ctrl_time = timestamp;
   }
-  gst_object_sync_values (G_OBJECT (src), v4l2src->ctrl_time);
+  gst_object_sync_values (GST_OBJECT (src), v4l2src->ctrl_time);
   GST_INFO_OBJECT (src, "sync to %" GST_TIME_FORMAT,
       GST_TIME_ARGS (v4l2src->ctrl_time));
 
diff --git a/tests/examples/shapewipe/shapewipe-example.c b/tests/examples/shapewipe/shapewipe-example.c
index e3b49fea8..1b2a69d93 100644
--- a/tests/examples/shapewipe/shapewipe-example.c
+++ b/tests/examples/shapewipe/shapewipe-example.c
@@ -18,7 +18,6 @@
  */
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/controller/gstlfocontrolsource.h>
 
 #include <stdlib.h>
@@ -78,7 +77,6 @@ main (gint argc, gchar ** argv)
   }
 
   gst_init (&argc, &argv);
-  gst_controller_init (&argc, &argv);
 
   if (argc > 2) {
     border = atof (argv[2]);
@@ -99,7 +97,7 @@ main (gint argc, gchar ** argv)
 
   shapewipe = gst_bin_get_by_name (GST_BIN (pipeline), "shape");
 
-  if (!(ctrl = gst_controller_new (G_OBJECT (shapewipe), "position", NULL))) {
+  if (!(ctrl = gst_controller_new (GST_OBJECT (shapewipe), "position", NULL))) {
     g_print ("can't control shapewipe element\n");
     return -3;
   }
diff --git a/tests/examples/v4l2/camctrl.c b/tests/examples/v4l2/camctrl.c
index 3c7262ab9..af75d69a8 100644
--- a/tests/examples/v4l2/camctrl.c
+++ b/tests/examples/v4l2/camctrl.c
@@ -31,7 +31,6 @@
  */
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/controller/gstinterpolationcontrolsource.h>
 
 static void
@@ -130,7 +129,6 @@ main (gint argc, gchar ** argv)
 
   /* init gstreamer */
   gst_init (&argc, &argv);
-  gst_controller_init (&argc, &argv);
 
   /* create a new bin to hold the elements */
   bin = gst_pipeline_new ("camera");
@@ -172,7 +170,7 @@ main (gint argc, gchar ** argv)
   }
 
   /* get the controller */
-  if (!(ctrl = gst_controller_new (G_OBJECT (src), "brightness", "contrast",
+  if (!(ctrl = gst_controller_new (GST_OBJECT (src), "brightness", "contrast",
               "saturation", NULL))) {
     GST_WARNING ("can't control source element");
     return -1;