diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2011-11-04 18:52:35 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2011-11-04 20:14:01 +0100 |
| commit | 9f738908929388464c950b1e45d427eae69268d6 (patch) | |
| tree | 0a4b895c3e2ebd5df9333cea82dd929c96d626f9 /gst/audiovisualizers | |
| parent | 8ec6da779780166d819e3791d5831b9c0fad4c8e (diff) | |
| download | gstreamer-plugins-bad-9f738908929388464c950b1e45d427eae69268d6.tar.gz | |
controller: port to new controller location and api
Diffstat (limited to 'gst/audiovisualizers')
| -rw-r--r-- | gst/audiovisualizers/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/audiovisualizers/gstbaseaudiovisualizer.c | 2 | ||||
| -rw-r--r-- | gst/audiovisualizers/plugin.c | 4 |
3 files changed, 3 insertions, 7 deletions
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); |