diff options
37 files changed, 36 insertions, 69 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); diff --git a/gst-libs/gst/signalprocessor/Makefile.am b/gst-libs/gst/signalprocessor/Makefile.am index f7e5f6520..9172685fb 100644 --- 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 5699c3895..3a089ed29 100644 --- 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 811c7d831..d98bf05d2 100644 --- 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 6d42b7dc5..fb6829700 100644 --- 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 4130f9725..e3ad7cb07 100644 --- 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 2dcbdd8e1..24a8b8062 100644 --- 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 a563ab3a6..1c5524af4 100644 --- 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 8d9d8a49f..feb34585a 100644 --- 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 11c43cc51..ef3712aca 100644 --- 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 513650cba..40a4a9ccc 100644 --- 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 5c876e5e9..3a1ebbd24 100644 --- 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 c7a9c71d5..d57c97cd4 100644 --- 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 54989c8f4..b148131e6 100644 --- 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 9c8e605c0..bf2983e88 100644 --- 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 c74e2607d..b3a8347c3 100644 --- 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 54e747722..9537e7af6 100644 --- 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 3d769356a..2aedfffb3 100644 --- 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 94d3b1505..ea8e01a9d 100644 --- 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 c89123c16..321709979 100644 --- 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 0b8f5d592..bfdebdfe2 100644 --- 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 6b1223e1d..861bbf9dd 100644 --- 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 143efb310..536bcb7e0 100644 --- 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 8cce8dbcf..e5023d22b 100644 --- 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 e304ed0b0..907204463 100644 --- 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 01e57c377..11e45fb50 100644 --- 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 ee5b5dca4..2efe4a6a4 100644 --- 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 db054c4f3..8b45e583c 100644 --- 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 f5095c238..b9e20dfe8 100644 --- 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 097acf3fc..a7c6ded65 100644 --- 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 65f532a84..a38aebd12 100644 --- 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 152bde35b..871df2959 100644 --- 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); |