summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorVincent Torri <vtorri@univ-evry.fr>2007-01-04 09:44:57 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-01-04 09:44:57 +0000
commite2117c6c678ae18f7cb5f6dd24b1b8d9b0fa84bf (patch)
tree2cfcee35a9c1b524102a9316e9d7370d3a59232f /sys
parente163953b0e1c80aab8622cc0ec5ed567da8097c1 (diff)
downloadgst-plugins-bad-e2117c6c678ae18f7cb5f6dd24b1b8d9b0fa84bf.tar.gz
gst-plugins-bad-e2117c6c678ae18f7cb5f6dd24b1b8d9b0fa84bf.tar.bz2
gst-plugins-bad-e2117c6c678ae18f7cb5f6dd24b1b8d9b0fa84bf.zip
Add directsoundsink to build and dist it, so it gets built when compiling with MingW on win32 and the required header...
Original commit message from CVS: Patch by: Vincent Torri <vtorri at univ-evry fr> * configure.ac: * sys/Makefile.am: * sys/directsound/Makefile.am: * sys/directsound/gstdirectsoundsink.c: (gst_directsoundsink_reset): Add directsoundsink to build and dist it, so it gets built when compiling with MingW on win32 and the required headers and libraries are available (fixes: #392638). Also simplify DirectDraw check a bit. * tests/check/elements/.cvsignore: Fix CVS ignore for neonhttpsrc test binary.
Diffstat (limited to 'sys')
-rw-r--r--sys/Makefile.am10
-rw-r--r--sys/directsound/Makefile.am9
-rw-r--r--sys/directsound/gstdirectsoundsink.c2
3 files changed, 18 insertions, 3 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 66c97a31..86d4f7a6 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -40,6 +40,12 @@ else
DIRECTDRAW_DIR=
endif
-SUBDIRS = $(GL_DIR) $(DVB_DIR) $(DIRECTDRAW_DIR)
+if USE_DIRECTSOUND
+DIRECTSOUND_DIR=directsound
+else
+DIRECTSOUND_DIR=
+endif
+
+SUBDIRS = $(GL_DIR) $(DVB_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR)
-DIST_SUBDIRS = glsink dvb directdraw
+DIST_SUBDIRS = glsink dvb directdraw directsound
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
new file mode 100644
index 00000000..b8b26469
--- /dev/null
+++ b/sys/directsound/Makefile.am
@@ -0,0 +1,9 @@
+plugin_LTLIBRARIES = libgstdirectsoundsink.la
+
+libgstdirectsoundsink_la_SOURCES = gstdirectsoundsink.c gstdirectsoundplugin.c
+libgstdirectsoundsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
+libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \
+ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+ -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
+libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/sys/directsound/gstdirectsoundsink.c b/sys/directsound/gstdirectsoundsink.c
index 8676238a..a159a9ee 100644
--- a/sys/directsound/gstdirectsoundsink.c
+++ b/sys/directsound/gstdirectsoundsink.c
@@ -485,7 +485,7 @@ gst_directsoundsink_reset (GstAudioSink * asink)
{
/*not tested for seeking */
GstDirectSoundSink *dsoundsink;
- LPBYTE pLockedBuffer = NULL;
+ LPVOID pLockedBuffer = NULL;
DWORD dwSizeBuffer = 0;
dsoundsink = GST_DIRECTSOUND_SINK (asink);