diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 14:32:32 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 14:32:32 +0100 |
| commit | 93e3ed5a869afb79f9658f22ced4691ce475e8a1 (patch) | |
| tree | baaec96daaf22857d61128401c12e2649ef25304 /sys/waveform | |
| parent | 692e00cc00d772fe2b01f518cb9ac88d124807d1 (diff) | |
| parent | 2b2c0940f1b7ce8a858a26ad5e246fd645a83830 (diff) | |
| download | gstreamer-plugins-good-93e3ed5a869afb79f9658f22ced4691ce475e8a1.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/cairo/gsttextoverlay.c
ext/pulse/pulseaudiosink.c
gst/audioparsers/gstaacparse.c
gst/avi/gstavimux.c
gst/flv/gstflvmux.c
gst/interleave/interleave.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.h
gst/matroska/matroska-read-common.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartmux.c
gst/shapewipe/gstshapewipe.c
gst/smpte/gstsmpte.c
gst/udp/gstmultiudpsink.c
gst/videobox/gstvideobox.c
gst/videocrop/gstaspectratiocrop.c
gst/videomixer/videomixer.c
gst/videomixer/videomixer2.c
gst/wavparse/gstwavparse.c
po/ja.po
po/lv.po
po/sr.po
tests/check/Makefile.am
tests/check/elements/qtmux.c
tests/check/elements/rgvolume.c
Diffstat (limited to 'sys/waveform')
| -rw-r--r-- | sys/waveform/Makefile.am | 10 | ||||
| -rw-r--r-- | sys/waveform/gstwaveformsink.c | 12 |
2 files changed, 7 insertions, 15 deletions
diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am index a9562a818..9a9fac3d7 100644 --- a/sys/waveform/Makefile.am +++ b/sys/waveform/Makefile.am @@ -1,19 +1,15 @@ plugin_LTLIBRARIES = libgstwaveformsink.la -# FIXME: Replace DIRECTSOUND CFLAGS+LIBS with waveform related ones and fix -# the configure.ac + sys/Makefile.am to get this stuff building in MingW -# For now, it's just disted for use in the VS builds. - libgstwaveformsink_la_SOURCES = gstwaveformsink.c gstwaveformplugin.c libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) libgstwaveformsink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ - $(DIRECTSOUND_LIBS) -libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) + -lwinmm +libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwaveformsink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstwaveformsink.h diff --git a/sys/waveform/gstwaveformsink.c b/sys/waveform/gstwaveformsink.c index 36542c182..e4b7016bb 100644 --- a/sys/waveform/gstwaveformsink.c +++ b/sys/waveform/gstwaveformsink.c @@ -49,10 +49,6 @@ GST_DEBUG_CATEGORY_STATIC (waveformsink_debug); -static void gst_waveform_sink_base_init (gpointer g_class); -static void gst_waveform_sink_class_init (GstWaveFormSinkClass * klass); -static void gst_waveform_sink_init (GstWaveFormSink * wfsink, - GstWaveFormSinkClass * g_class); static void gst_waveform_sink_finalise (GObject * object); static void gst_waveform_sink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); @@ -154,7 +150,7 @@ static void gst_waveform_sink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (object); + /* GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (object); */ switch (prop_id) { default: @@ -167,7 +163,7 @@ static void gst_waveform_sink_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (object); + /* GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (object); */ switch (prop_id) { default: @@ -348,7 +344,7 @@ gst_waveform_sink_getcaps (GstBaseSink * bsink) static gboolean gst_waveform_sink_open (GstAudioSink * asink) { - GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink); + /* GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink); */ /* nothing to do here as the device needs to be opened with the format we will use */ @@ -448,7 +444,7 @@ gst_waveform_sink_unprepare (GstAudioSink * asink) static gboolean gst_waveform_sink_close (GstAudioSink * asink) { - GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink); + /* GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink); */ return TRUE; } |