controller: port to new controller location and api

diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index 353ec5ebbc451f12a32c866b03a22505e5d2f710..3d9695338ae9198fbad88d9c702b52cfbd9356fd 100644 (file)
--- 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 52a8d5b2d59bcdfd0bc756705bed72b4d2f30883..da03e6febc739716f853ca580d50976c71f67347 100644 (file)
--- 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 7b6ac4e52d98e08de468104cd8d2c2fb06fb8955..76333e79eb8475fa5e04f072510ad7591fe859a4 100644 (file)
--- 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 f31050fc66fa0f4d451d16095d146b35b4cce6aa..6a4fcb1a2b6c14ca6f82a671436b0a9327b1a563 100644 (file)
--- 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 74a5516d4acb041eb87f025ffd6a09bd59e07a6b..07832a7bc5c89ab8a5821ec92cdd5113b942ba62 100644 (file)
--- 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 5e8cb1563dcbc7dbae381afd1da665569d5b8e5b..77cc3049240d77a2b8b3a86fa1a9573c323e7eaa 100644 (file)
--- 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);

diff --git a/gst-libs/gst/signalprocessor/Makefile.am b/gst-libs/gst/signalprocessor/Makefile.am
index f7e5f65207e83fe134a14dfacd67c7b026090ffe..9172685fb7d84d213ef78a08d55cccd0fc3fba2e 100644 (file)
--- a/gst-libs/gst/signalprocessor/Makefile.am
+++ b/gst-libs/gst/signalprocessor/Makefile.am
@@ -7,10 +7,10 @@ libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
 libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \
     $(GST_PLUGINS_BAD_CFLAGS) \
     $(GST_PLUGINS_BASE_CFLAGS) \
-    $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+    $(GST_CFLAGS)
 libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \
     $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
-    $(GST_CONTROLLER_LIBS) $(GST_LIBS)
+    $(GST_LIBS)
 libgstsignalprocessor_@GST_MAJORMINOR@_la_LDFLAGS = \
     $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 

diff --git a/gst-libs/gst/signalprocessor/gstsignalprocessor.c b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
index 5699c389587202ec8dc923bd80fb965bdc985b77..3a089ed291bc8e29fb709ede324a18382d446527 100644 (file)
--- a/gst-libs/gst/signalprocessor/gstsignalprocessor.c
+++ b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
@@ -44,7 +44,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gst/controller/gstcontroller.h>
 #include <gst/audio/audio.h>
 #include "gstsignalprocessor.h"
 
@@ -780,7 +779,7 @@ gst_signal_processor_prepare (GstSignalProcessor * self, guint nframes)
 
   /* update controlled parameters */
   if (samples_avail && GST_CLOCK_TIME_IS_VALID (ts)) {
-    gst_object_sync_values ((GObject *) self, ts);
+    gst_object_sync_values ((GstObject *) self, ts);
   }
 
   return samples_avail;

diff --git a/gst/audiovisualizers/Makefile.am b/gst/audiovisualizers/Makefile.am
index 811c7d831f6bd28233a9f1c9873d1fe3a0d58043..d98bf05d2bf3ba3f9427116ab3200caca2a976b9 100644 (file)
--- a/gst/audiovisualizers/Makefile.am
+++ b/gst/audiovisualizers/Makefile.am
@@ -9,11 +9,11 @@ libgstaudiovisualizers_la_SOURCES = plugin.c \
 
 libgstaudiovisualizers_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
-       $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+       $(GST_CFLAGS)
 libgstaudiovisualizers_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
        -lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \
-       $(GST_BASE_LIBS)  $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM)
+       $(GST_BASE_LIBS)  $(GST_LIBS) $(LIBM)
 libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/audiovisualizers/gstbaseaudiovisualizer.c b/gst/audiovisualizers/gstbaseaudiovisualizer.c
index 6d42b7dc58dab8cf2c44193bf4a3cdfc9cc87019..fb6829700cf415100078b05de80a2433f56b23ec 100644 (file)
--- a/gst/audiovisualizers/gstbaseaudiovisualizer.c
+++ b/gst/audiovisualizers/gstbaseaudiovisualizer.c
@@ -783,7 +783,7 @@ gst_base_audio_visualizer_chain (GstPad * pad, GstBuffer * buffer)
       break;
 
     /* sync controlled properties */
-    gst_object_sync_values (G_OBJECT (scope), scope->next_ts);
+    gst_object_sync_values (GST_OBJECT (scope), scope->next_ts);
 
     GST_BUFFER_TIMESTAMP (outbuf) = scope->next_ts;
     GST_BUFFER_DURATION (outbuf) = scope->frame_duration;

diff --git a/gst/audiovisualizers/plugin.c b/gst/audiovisualizers/plugin.c
index 4130f9725c9b5d215bd3b1fdfb5b531e9f8a7bba..e3ad7cb07c25fbc2c85aad3273d6383d702e18f1 100644 (file)
--- a/gst/audiovisualizers/plugin.c
+++ b/gst/audiovisualizers/plugin.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstspacescope.h"
 #include "gstspectrascope.h"
@@ -34,9 +33,6 @@ plugin_init (GstPlugin * plugin)
 {
   gboolean res = TRUE;
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   res &= gst_space_scope_plugin_init (plugin);
   res &= gst_spectra_scope_plugin_init (plugin);
   res &= gst_synae_scope_plugin_init (plugin);

diff --git a/gst/coloreffects/Makefile.am b/gst/coloreffects/Makefile.am
index 2dcbdd8e177a73c4846b5d1edbd39102c29fd4a3..24a8b8062ceea40613f0ba19b62f176405ae5056 100644 (file)
--- a/gst/coloreffects/Makefile.am
+++ b/gst/coloreffects/Makefile.am
@@ -6,12 +6,10 @@ libgstcoloreffects_la_SOURCES = \
        gstchromahold.c
 libgstcoloreffects_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
-       $(GST_CONTROLLER_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS)
 libgstcoloreffects_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
-       $(GST_CONTROLLER_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstcoloreffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/coloreffects/gstchromahold.c b/gst/coloreffects/gstchromahold.c
index a563ab3a61e216c98dd6474896bdce829870eef6..1c5524af49aadcb11a7f909d0633ae19811838ea 100644 (file)
--- a/gst/coloreffects/gstchromahold.c
+++ b/gst/coloreffects/gstchromahold.c
@@ -437,7 +437,7 @@ gst_chroma_hold_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 (self), timestamp);
+    gst_object_sync_values (GST_OBJECT (self), timestamp);
 }
 
 static GstFlowReturn

diff --git a/gst/filter/Makefile.am b/gst/filter/Makefile.am
index 8d9d8a49fde54cce3455be068b119a64307cdf3f..feb34585a2005f3da5f2da65a55afffdb9d2f024 100644 (file)
--- a/gst/filter/Makefile.am
+++ b/gst/filter/Makefile.am
@@ -2,11 +2,10 @@
 plugin_LTLIBRARIES = libgstfilter.la
 
 libgstfilter_la_SOURCES = gstfilter.c gstiir.c iir.c
-libgstfilter_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS)
+libgstfilter_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfilter_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
-       $(GST_CONTROLLER_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-$(GST_MAJORMINOR) \
        $(LIBM)

diff --git a/gst/filter/gstfilter.c b/gst/filter/gstfilter.c
index 11c43cc517569f1c20104b214c732c83697d6e29..ef3712aca56be3ca869e93fe0b136c02585a6408 100644 (file)
--- a/gst/filter/gstfilter.c
+++ b/gst/filter/gstfilter.c
@@ -28,7 +28,6 @@
 #endif
 #include "gstfilter.h"
 #include <gst/audio/audio.h>
-#include <gst/controller/gstcontroller.h>
 
 struct _elements_entry
 {
@@ -46,9 +45,6 @@ plugin_init (GstPlugin * plugin)
 {
   gint i = 0;
 
-  /* initialize gst controller library */
-  gst_controller_init (NULL, NULL);
-
   while (_elements[i].name) {
     if (!gst_element_register (plugin, _elements[i].name, GST_RANK_NONE,
             _elements[i].type ()))

diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c
index 513650cba2708e99132e4e887152da4b3a944f4c..40a4a9ccc2bd175d948157a8f7760a65800b0b12 100644 (file)
--- a/gst/filter/gstiir.c
+++ b/gst/filter/gstiir.c
@@ -189,7 +189,7 @@ iir_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
   timestamp = GST_BUFFER_TIMESTAMP (outbuf);
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (this), timestamp);
+    gst_object_sync_values (GST_OBJECT (this), timestamp);
 
   src = (gfloat *) GST_BUFFER_DATA (outbuf);
 

diff --git a/gst/frei0r/Makefile.am b/gst/frei0r/Makefile.am
index 5c876e5e9b3558fd9b95e009114d5283124fbc0b..3a1ebbd248add0edc4c1203b9ef68d66d76f5474 100644 (file)
--- a/gst/frei0r/Makefile.am
+++ b/gst/frei0r/Makefile.am
@@ -6,8 +6,8 @@ libgstfrei0r_la_SOURCES = \
        gstfrei0rsrc.c \
        gstfrei0rmixer.c
 
-libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
+libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
        -lgstvideo-@GST_MAJORMINOR@
 libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c
index c7a9c71d59761e74d0bf02d5ace323cf7a9c4900..d57c97cd42feff45cfe68c4e87c449ce739965d7 100644 (file)
--- a/gst/frei0r/gstfrei0r.c
+++ b/gst/frei0r/gstfrei0r.c
@@ -26,7 +26,6 @@
 #include "gstfrei0rsrc.h"
 #include "gstfrei0rmixer.h"
 
-#include <gst/controller/gstcontroller.h>
 #include <string.h>
 
 GST_DEBUG_CATEGORY (frei0r_debug);
@@ -668,8 +667,6 @@ plugin_init (GstPlugin * plugin)
 
   GST_DEBUG_CATEGORY_INIT (frei0r_debug, "frei0r", 0, "frei0r");
 
-  gst_controller_init (NULL, NULL);
-
   gst_plugin_add_dependency_simple (plugin,
       "FREI0R_PATH:HOME/.frei0r-1/lib",
       "/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:"

diff --git a/gst/frei0r/gstfrei0rfilter.c b/gst/frei0r/gstfrei0rfilter.c
index 54989c8f43392d4e7447143c2a2ba571968e4885..b148131e64d80778532271a643fee6291a5f34f0 100644 (file)
--- a/gst/frei0r/gstfrei0rfilter.c
+++ b/gst/frei0r/gstfrei0rfilter.c
@@ -81,7 +81,7 @@ gst_frei0r_filter_before_transform (GstBaseTransform * trans,
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (self), timestamp);
+    gst_object_sync_values (GST_OBJECT (self), timestamp);
 }
 
 static GstFlowReturn

diff --git a/gst/frei0r/gstfrei0rmixer.c b/gst/frei0r/gstfrei0rmixer.c
index 9c8e605c00deb20ddd7bfffb5aa6e181622102e8..bf2983e886afb23779d143aee8ab43cce37d7a5f 100644 (file)
--- a/gst/frei0r/gstfrei0rmixer.c
+++ b/gst/frei0r/gstfrei0rmixer.c
@@ -598,7 +598,7 @@ gst_frei0r_mixer_collected (GstCollectPads * pads, GstFrei0rMixer * self)
       GST_TIME_ARGS (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_buffer_copy_metadata (outbuf, inbuf0,
       GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS);

diff --git a/gst/frei0r/gstfrei0rsrc.c b/gst/frei0r/gstfrei0rsrc.c
index c74e2607d12f5d0a168d61fb3deb6707d2aaf904..b3a8347c331ff0a5668b4e2e1fe361628d06272a 100644 (file)
--- a/gst/frei0r/gstfrei0rsrc.c
+++ b/gst/frei0r/gstfrei0rsrc.c
@@ -122,7 +122,7 @@ gst_frei0r_src_create (GstPushSrc * src, GstBuffer ** buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (self), timestamp);
+    gst_object_sync_values (GST_OBJECT (self), timestamp);
 
   time = ((gdouble) GST_BUFFER_TIMESTAMP (outbuf)) / GST_SECOND;
 

diff --git a/gst/gaudieffects/Makefile.am b/gst/gaudieffects/Makefile.am
index 54e74772261aeeeae4d403dabdb20fd6829375e2..9537e7af6979c879ecc78d50a902ce20ba4af900 100644 (file)
--- a/gst/gaudieffects/Makefile.am
+++ b/gst/gaudieffects/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstgaudieffects.la
 
 libgstgaudieffects_la_SOURCES = gstburn.c gstchromium.c gstdilate.c \
         gstdodge.c gstexclusion.c gstgaussblur.c gstsolarize.c gstplugin.c
-libgstgaudieffects_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
-libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM)
+libgstgaudieffects_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) $(LIBM)
 libgstgaudieffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgaudieffects_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/gaudieffects/gstburn.c b/gst/gaudieffects/gstburn.c
index 3d769356a0808c163dbb870ba64c9211fe8dc7b7..2aedfffb3dff72b096e2d1ac83d1b2555e785057 100644 (file)
--- a/gst/gaudieffects/gstburn.c
+++ b/gst/gaudieffects/gstburn.c
@@ -265,7 +265,7 @@ gst_burn_transform (GstBaseTransform * btrans,
       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_OBJECT_LOCK (filter);
   adjustment = filter->adjustment;

diff --git a/gst/gaudieffects/gstchromium.c b/gst/gaudieffects/gstchromium.c
index 94d3b150585ee97708531cc7ab1724c88c415d22..ea8e01a9d31471c709f2cc9d7000be9107cedf55 100644 (file)
--- a/gst/gaudieffects/gstchromium.c
+++ b/gst/gaudieffects/gstchromium.c
@@ -294,7 +294,7 @@ gst_chromium_transform (GstBaseTransform * btrans,
       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_OBJECT_LOCK (filter);
   edge_a = filter->edge_a;

diff --git a/gst/gaudieffects/gstdilate.c b/gst/gaudieffects/gstdilate.c
index c89123c1634a47b613c6fe99ba5aa88939d42193..321709979b0f92357750b6e40efeeb8eb0f53797 100644 (file)
--- a/gst/gaudieffects/gstdilate.c
+++ b/gst/gaudieffects/gstdilate.c
@@ -266,7 +266,7 @@ gst_dilate_transform (GstBaseTransform * btrans,
       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_OBJECT_LOCK (filter);
   erode = filter->erode;

diff --git a/gst/gaudieffects/gstexclusion.c b/gst/gaudieffects/gstexclusion.c
index 0b8f5d592083a1d3bc8891b70f7676e2f7a1343a..bfdebdfe2ffb0bccabc7ad14fa3ff1bc8f4e3ab7 100644 (file)
--- a/gst/gaudieffects/gstexclusion.c
+++ b/gst/gaudieffects/gstexclusion.c
@@ -263,7 +263,7 @@ gst_exclusion_transform (GstBaseTransform * btrans,
       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_OBJECT_LOCK (filter);
   factor = filter->factor;

diff --git a/gst/gaudieffects/gstgaussblur.c b/gst/gaudieffects/gstgaussblur.c
index 6b1223e1d38715c05c4d85f5e59456ccb699fbc0..861bbf9ddce8d920c5c04662bea79a5c2718361e 100644 (file)
--- a/gst/gaudieffects/gstgaussblur.c
+++ b/gst/gaudieffects/gstgaussblur.c
@@ -169,7 +169,7 @@ gauss_blur_process_frame (GstBaseTransform * btrans,
   stream_time =
       gst_segment_to_stream_time (&btrans->segment, GST_FORMAT_TIME, timestamp);
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (gb), stream_time);
+    gst_object_sync_values (GST_OBJECT (gb), stream_time);
 
   GST_OBJECT_LOCK (gb);
   sigma = gb->sigma;

diff --git a/gst/gaudieffects/gstplugin.c b/gst/gaudieffects/gstplugin.c
index 143efb310ce299496beb3cd6e38ab0a1faf41b24..536bcb7e0818fe34059faef59a1db411132c01a4 100644 (file)
--- a/gst/gaudieffects/gstplugin.c
+++ b/gst/gaudieffects/gstplugin.c
@@ -48,7 +48,6 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "gstplugin.h"
 
@@ -66,8 +65,6 @@ plugin_init (GstPlugin * plugin)
 {
   gboolean ret = TRUE;
 
-  gst_controller_init (NULL, NULL);
-
   ret &= gst_burn_plugin_init (plugin);
   ret &= gst_chromium_plugin_init (plugin);
   ret &= gst_dilate_plugin_init (plugin);

diff --git a/gst/gaudieffects/gstsolarize.c b/gst/gaudieffects/gstsolarize.c
index 8cce8dbcf9fbee5dbfb6cc9e2fbf125a08577c90..e5023d22b27cedb9704119e924b1dba42b6a7f19 100644 (file)
--- a/gst/gaudieffects/gstsolarize.c
+++ b/gst/gaudieffects/gstsolarize.c
@@ -292,7 +292,7 @@ gst_solarize_transform (GstBaseTransform * btrans,
       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_OBJECT_LOCK (filter);
   threshold = filter->threshold;

diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am
index e304ed0b09ed9a08c721966ea0f9cab108997cce..9072044637467b44bdc1b464a60a809b4a1835f1 100644 (file)
--- a/gst/geometrictransform/Makefile.am
+++ b/gst/geometrictransform/Makefile.am
@@ -21,12 +21,10 @@ libgstgeometrictransform_la_SOURCES = plugin.c \
                                       gstfisheye.c
 
 libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-                           $(GST_PLUGINS_BASE_CFLAGS) \
-                            $(GST_CONTROLLER_CFLAGS)
+                           $(GST_PLUGINS_BASE_CFLAGS)
 libgstgeometrictransform_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                             -lgstvideo-@GST_MAJORMINOR@ \
                             -lgstinterfaces-@GST_MAJORMINOR@ \
-                            $(GST_CONTROLLER_LIBS) \
                             $(GST_BASE_LIBS) \
                             $(GST_LIBS) $(LIBM)
 libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c
index 01e57c377709b0a74d8a22e211ea57126f350301..11e45fb504ea9e131f385942e74fa96d63786578 100644 (file)
--- a/gst/geometrictransform/gstgeometrictransform.c
+++ b/gst/geometrictransform/gstgeometrictransform.c
@@ -246,7 +246,7 @@ gst_geometric_transform_before_transform (GstBaseTransform * trans,
   GST_DEBUG_OBJECT (gt, "sync to %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (gt), stream_time);
+    gst_object_sync_values (GST_OBJECT (gt), stream_time);
 }
 
 static GstFlowReturn

diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am
index ee5b5dca42845fecaba73644d7dfbfedffb10e94..2efe4a6a4c1bcac284a9356a5c529a01f7e9f55a 100644 (file)
--- a/gst/stereo/Makefile.am
+++ b/gst/stereo/Makefile.am
@@ -2,8 +2,8 @@
 plugin_LTLIBRARIES = libgststereo.la
 
 libgststereo_la_SOURCES = gststereo.c
-libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS)
-libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
+libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
+libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
 libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgststereo_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c
index db054c4f3392a972c02142d636b6b4650cc68383..8b45e583ca72c008d9aef7782f165df6916a21a7 100644 (file)
--- a/gst/stereo/gststereo.c
+++ b/gst/stereo/gststereo.c
@@ -145,7 +145,7 @@ gst_stereo_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
     return GST_FLOW_OK;
 
   if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
-    gst_object_sync_values (G_OBJECT (stereo), GST_BUFFER_TIMESTAMP (outbuf));
+    gst_object_sync_values (GST_OBJECT (stereo), GST_BUFFER_TIMESTAMP (outbuf));
 
   if (stereo->active) {
     for (i = 0; i < samples / 2; i += 2) {

diff --git a/gst/subenc/Makefile.am b/gst/subenc/Makefile.am
index f5095c2386f8d708334949ab40c700a0f636143f..b9e20dfe87e051918e111591a99b1ecca40dc61a 100644 (file)
--- a/gst/subenc/Makefile.am
+++ b/gst/subenc/Makefile.am
@@ -4,8 +4,8 @@ libgstsubenc_la_SOURCES = \
        gstsrtenc.c \
        gstsubenc.c \
        gstwebvttenc.c
-libgstsubenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS)
-libgstsubenc_la_LIBADD = $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS)
+libgstsubenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstsubenc_la_LIBADD = $(GST_BASE_LIBS)
 libgstsubenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsubenc_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/subenc/gstsrtenc.c b/gst/subenc/gstsrtenc.c
index 097acf3fc6726b286086d5ec6e7f82e43a518afe..a7c6ded65c0dea724c41df4d5946499c45c6fc80 100644 (file)
--- a/gst/subenc/gstsrtenc.c
+++ b/gst/subenc/gstsrtenc.c
@@ -100,7 +100,7 @@ gst_srt_enc_chain (GstPad * pad, GstBuffer * buf)
   gchar *string;
 
   srtenc = GST_SRT_ENC (gst_pad_get_parent_element (pad));
-  gst_object_sync_values (G_OBJECT (srtenc), GST_BUFFER_TIMESTAMP (buf));
+  gst_object_sync_values (GST_OBJECT (srtenc), GST_BUFFER_TIMESTAMP (buf));
   timing = gst_srt_enc_timeconvertion (srtenc, buf);
   string = g_strdup_printf ("%d\n%s", srtenc->counter++, timing);
   g_free (timing);

diff --git a/gst/subenc/gstwebvttenc.c b/gst/subenc/gstwebvttenc.c
index 65f532a84e3f8842b41fc6556d751a6f554cc931..a38aebd125f215e535bba6683332663e8dc34148 100644 (file)
--- a/gst/subenc/gstwebvttenc.c
+++ b/gst/subenc/gstwebvttenc.c
@@ -127,7 +127,7 @@ gst_webvtt_enc_chain (GstPad * pad, GstBuffer * buf)
     webvttenc->pushed_header = TRUE;
   }
 
-  gst_object_sync_values (G_OBJECT (webvttenc), GST_BUFFER_TIMESTAMP (buf));
+  gst_object_sync_values (GST_OBJECT (webvttenc), GST_BUFFER_TIMESTAMP (buf));
 
   timing = gst_webvtt_enc_timeconvertion (webvttenc, buf);
   new_buffer =

diff --git a/tests/icles/pitch-test.c b/tests/icles/pitch-test.c
index 152bde35b03d3f721289527607149b65af106042..871df2959c3e499a62d737cd1da7183d81206df1 100644 (file)
--- a/tests/icles/pitch-test.c
+++ b/tests/icles/pitch-test.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <gst/gst.h>
-#include <gst/controller/gstcontroller.h>
 
 int
 main (int argc, char **argv)
@@ -49,7 +48,6 @@ main (int argc, char **argv)
 
   /* initialize GStreamer */
   gst_init (&argc, &argv);
-  gst_controller_init (&argc, &argv);
 
   loop = g_main_loop_new (NULL, FALSE);