controller: port to new controller api

diff --git a/tests/benchmarks/controller.c b/tests/benchmarks/controller.c
index 32eaff2..7088b6f 100644 (file)
--- a/tests/benchmarks/controller.c
+++ b/tests/benchmarks/controller.c
@@ -20,7 +20,6 @@
  */
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/controller/gstinterpolationcontrolsource.h>
 
 /* a song in buzztard can easily reach 30000 here */
@@ -89,7 +88,6 @@ main (gint argc, gchar * argv[])
   GstClockTime tick;
 
   gst_init (&argc, &argv);
-  gst_controller_init (&argc, &argv);
 
   /* build pipeline */
   bin = gst_pipeline_new ("pipeline");
@@ -112,7 +110,7 @@ main (gint argc, gchar * argv[])
   tick = BLOCK_SIZE * GST_SECOND / 44100;
 
   /* add a controller to the source */
-  if (!(ctrl = gst_controller_new (G_OBJECT (src), "freq", NULL))) {
+  if (!(ctrl = gst_controller_new (GST_OBJECT (src), "freq", NULL))) {
     GST_WARNING ("can't control source element");
     goto Error;
   }

diff --git a/tests/examples/controller/audio-example.c b/tests/examples/controller/audio-example.c
index f5b2774..22d54b2 100644 (file)
--- a/tests/examples/controller/audio-example.c
+++ b/tests/examples/controller/audio-example.c
@@ -8,7 +8,6 @@
  */
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 #include <gst/controller/gstinterpolationcontrolsource.h>
 
 gint
@@ -25,7 +24,6 @@ main (gint argc, gchar ** argv)
   GValue vol = { 0, };
 
   gst_init (&argc, &argv);
-  gst_controller_init (&argc, &argv);
 
   /* build pipeline */
   bin = gst_pipeline_new ("pipeline");
@@ -52,7 +50,7 @@ main (gint argc, gchar ** argv)
    */
 
   /* add a controller to the source */
-  if (!(ctrl = gst_controller_new (G_OBJECT (src), "freq", "volume", NULL))) {
+  if (!(ctrl = gst_controller_new (GST_OBJECT (src), "freq", "volume", NULL))) {
     GST_WARNING ("can't control source element");
     goto Error;
   }

diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 9f54961..6fb3407 100644 (file)
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -25,8 +25,6 @@
 #  include "config.h"
 #endif
 
-#include <gst/controller/gstcontroller.h>
-
 #include "tools.h"
 
 #include <string.h>