directdraw, directsound: unify CFLAGS and fix configure checks for DirectX-based plugins

One set of CFLAGS for all DirectX-based plugins. Correct header/library
checks for DirectX-based-plugins. Remove unused variable and label in
directsoundsrc.

Fixes #593068.

3 files changed, 24 insertions, 32 deletions

diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am
index 647d58ac2..559db9b36 100644
--- a/sys/directdraw/Makefile.am
+++ b/sys/directdraw/Makefile.am
@@ -1,12 +1,12 @@
-plugin_LTLIBRARIES = libgstdirectdrawsink.la

-

-libgstdirectdrawsink_la_SOURCES =  gstdirectdrawsink.c gstdirectdrawplugin.c

-libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \

-	$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTDRAW_CFLAGS)

-libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \

-	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \

-	-lgstinterfaces-$(GST_MAJORMINOR)

-libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)

-libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static

-

-noinst_HEADERS= gstdirectdrawsink.h

+plugin_LTLIBRARIES = libgstdirectdrawsink.la
+
+libgstdirectdrawsink_la_SOURCES =  gstdirectdrawsink.c gstdirectdrawplugin.c
+libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS)
+libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
+	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	-lgstinterfaces-$(GST_MAJORMINOR)
+libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
+libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS= gstdirectdrawsink.h
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index 319940148..cd1e05944 100644
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -1,12 +1,12 @@
-plugin_LTLIBRARIES = libgstdirectsoundsrc.la

-

-libgstdirectsoundsrc_la_SOURCES =  gstdirectsoundsrc.c gstdirectsoundplugin.c

-libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \

-	$(GST_PLUGINS_BASE_CFLAGS)

-libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \

-	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \

-	-lgstinterfaces-$(GST_MAJORMINOR) -ldsound

-libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)

-libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static

-

-noinst_HEADERS= gstdirectsoundsrc.h

+plugin_LTLIBRARIES = libgstdirectsoundsrc.la
+
+libgstdirectsoundsrc_la_SOURCES =  gstdirectsoundsrc.c gstdirectsoundplugin.c
+libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS)
+libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \
+	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	-lgstinterfaces-$(GST_MAJORMINOR) -ldsound
+libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
+libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS= gstdirectsoundsrc.h
diff --git a/sys/directsound/gstdirectsoundsrc.c b/sys/directsound/gstdirectsoundsrc.c
index fce9d5c8c..76a3dcf4b 100755
--- a/sys/directsound/gstdirectsoundsrc.c
+++ b/sys/directsound/gstdirectsoundsrc.c
@@ -365,8 +365,6 @@ gst_directsound_src_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   HRESULT hRes;                 /* Result for windows functions */
   DSCBUFFERDESC descSecondary;  /* Capturebuffer decsiption */
 
-  int fmt = 0;                  /* audio format */
-
   dsoundsrc = GST_DIRECTSOUND_SRC (asrc);
 
   GST_DEBUG ("initializing directsoundsrc\n");
@@ -473,12 +471,6 @@ WAVEFORMATEX.nBlockAlign: %d, WAVEFORMATEX.nAvgBytesPerSec: %ld\n", spec->channe
 
   return TRUE;
 
-wrong_format:
-  {
-    GST_ELEMENT_ERROR (dsoundsrc, RESOURCE, OPEN_READ,
-        ("Unable to get format %d", spec->format), (NULL));
-    return FALSE;
-  }
 capture_buffer:
   {
     GST_ELEMENT_ERROR (dsoundsrc, RESOURCE, OPEN_READ,