mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 17:18:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

controller: port to new controller location and api

Browse source
This commit is contained in:
Stefan Sauer 2011-11-04 18:52:35 +01:00
parent 8ec6da7797
commit 9f73890892
37 changed files with 36 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/ladspa/Makefile.am
View file

@ -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

4
ext/ladspa/gstladspa.c
View file

@ -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);

4
ext/lv2/Makefile.am
View file

@ -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

4
ext/lv2/gstlv2.c
View file

@ -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);

2
ext/soundtouch/Makefile.am
View file

@ -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

3
ext/soundtouch/plugin.c
View file

@ -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);

4
gst-libs/gst/signalprocessor/Makefile.am
View file

@ -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)

3
gst-libs/gst/signalprocessor/gstsignalprocessor.c
View file

@ -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;

4
gst/audiovisualizers/Makefile.am
View file

@ -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

2
gst/audiovisualizers/gstbaseaudiovisualizer.c
View file

@ -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;

4
gst/audiovisualizers/plugin.c
View file

@ -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);

2
gst/coloreffects/Makefile.am
View file

@ -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)

2
gst/coloreffects/gstchromahold.c
View file

@ -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

3
gst/filter/Makefile.am
View file

@ -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)

4
gst/filter/gstfilter.c
View file

@ -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 ()))

2
gst/filter/gstiir.c
View file

@ -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);

4
gst/frei0r/Makefile.am
View file

@ -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

3
gst/frei0r/gstfrei0r.c
View file

@ -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:"

2
gst/frei0r/gstfrei0rfilter.c
View file

@ -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

2
gst/frei0r/gstfrei0rmixer.c
View file

@ -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);

2
gst/frei0r/gstfrei0rsrc.c
View file

@ -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;

4
gst/gaudieffects/Makefile.am
View file

@ -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

2
gst/gaudieffects/gstburn.c
View file

@ -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;

2
gst/gaudieffects/gstchromium.c
View file

@ -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;

2
gst/gaudieffects/gstdilate.c
View file

@ -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;

2
gst/gaudieffects/gstexclusion.c
View file

@ -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;

2
gst/gaudieffects/gstgaussblur.c
View file

@ -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;

3
gst/gaudieffects/gstplugin.c
View file

@ -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);

2
gst/gaudieffects/gstsolarize.c
View file

@ -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;

4
gst/geometrictransform/Makefile.am
View file

@ -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)

2
gst/geometrictransform/gstgeometrictransform.c
View file

@ -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

4
gst/stereo/Makefile.am
View file

@ -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

2
gst/stereo/gststereo.c
View file

@ -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) {

4
gst/subenc/Makefile.am
View file

@ -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

2
gst/subenc/gstsrtenc.c
View file

@ -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);

2
gst/subenc/gstwebvttenc.c
View file

@ -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 =

2
tests/icles/pitch-test.c
View file

@ -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);