File mingw32-gst-plugins-good-waveform-git.patch of Package mingw32-gst-plugins-good

Overview Repositories Revisions Requests Users Attributes Meta

File mingw32-gst-plugins-good-waveform-git.patch of Package mingw32-gst-plugins-good (Revision c3e02026f5c9a94091a98a390101e01c)

Currently displaying revision c3e02026f5c9a94091a98a390101e01c , Show latest

--- configure.ac	0.10.31
+++ configure.ac	git
@@ -444,6 +444,12 @@
   AC_SUBST(HAVE_DIRECTSOUND)
 ])
 
+dnl *** Win32 WaveOut ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_WAVEFORM, true)
+AG_GST_CHECK_FEATURE(WAVEFORM, [Win32 WaveForm], waveformsink, [
+  AC_CHECK_HEADER(mmsystem.h, HAVE_WAVEFORM="yes", HAVE_WAVEFORM="no", [#include <windows.h>])
+])
+
 dnl *** OSS audio *** (Linux, *BSD)
 translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
 AG_GST_CHECK_FEATURE(OSS, [OSS audio], ossaudio, [
@@ -1046,6 +1052,7 @@
 AM_CONDITIONAL(USE_SPEEX, false)
 AM_CONDITIONAL(USE_SUNAUDIO, false)
 AM_CONDITIONAL(USE_TAGLIB, false)
+AM_CONDITIONAL(USE_WAVEFORM, false)
 AM_CONDITIONAL(USE_WAVPACK, false)
 AM_CONDITIONAL(USE_X, false)
 AM_CONDITIONAL(USE_XSHM, false)
--- sys/Makefile.am	0.10.31
+++ sys/Makefile.am	git
@@ -23,6 +23,12 @@
 DIRECTSOUND_DIR=
 endif
 
+if USE_WAVEFORM
+WAVEFORM_DIR=waveform
+else
+WAVEFORM_DIR=
+endif
+
 if USE_SUNAUDIO
 SUNAUDIO_DIR=sunaudio
 else
@@ -77,7 +83,7 @@
 XIMAGE_DIR=
 endif
 
-SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
+SUBDIRS=$(DIRECTSOUND_DIR) $(WAVEFORM_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
 
 DIST_SUBDIRS=directsound oss oss4 osxaudio osxvideo sunaudio v4l2 waveform ximage
 
--- sys/waveform/gstwaveformsink.c	0.10.31
+++ sys/waveform/gstwaveformsink.c	git
@@ -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 @@
 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 @@
 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 @@
 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 @@
 static gboolean
 gst_waveform_sink_close (GstAudioSink * asink)
 {
-  GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink);
+  /* GstWaveFormSink *wfsink = GST_WAVEFORM_SINK (asink); */
 
   return TRUE;
 }
--- sys/waveform/Makefile.am	0.10.31
+++ sys/waveform/Makefile.am	git
@@ -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

Places

File mingw32-gst-plugins-good-waveform-git.patch of Package mingw32-gst-plugins-good (Revision c3e02026f5c9a94091a98a390101e01c)

Places