From 853a9f7fe9956bf6afe10694bdb3def96cf046b7 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 8 Jun 2007 17:37:02 +0000 Subject: Add DirectDraw & DirectSound plugins to the build and docs. Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.args: * sys/Makefile.am: * win32/MANIFEST: Add DirectDraw & DirectSound plugins to the build and docs. --- ChangeLog | 11 +++ configure.ac | 85 ++++++++++++++++++++++ docs/plugins/Makefile.am | 2 + docs/plugins/gst-plugins-good-plugins-docs.sgml | 4 + docs/plugins/gst-plugins-good-plugins-sections.txt | 16 ++++ docs/plugins/gst-plugins-good-plugins.args | 10 +++ sys/Makefile.am | 16 +++- win32/MANIFEST | 6 ++ 8 files changed, 148 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecbabd29..cd46c583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-06-08 Jan Schmidt + + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.args: + * sys/Makefile.am: + * win32/MANIFEST: + Add DirectDraw & DirectSound plugins to the build and docs. + 2007-06-08 Tim-Philipp Müller * ext/dv/gstdvdemux.c: (gst_dvdemux_loop): diff --git a/configure.ac b/configure.ac index 74d913f2..1a22cbaa 100644 --- a/configure.ac +++ b/configure.ac @@ -347,6 +347,87 @@ echo AC_MSG_NOTICE([Checking libraries for plugins in sys/]) echo +dnl DirectDraw +translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTDRAW, true) +AG_GST_CHECK_FEATURE(DIRECTDRAW, [DirectDraw plug-in], directdrawsink, [ + HAVE_DIRECTDRAW="no" + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $DIRECTDRAW_CFLAGS" + LDFLAGS="$LDFLAGS $DIRECTDRAW_LDFLAGS" + LIBS="$LIBS -lddraw -lgdi32" + AC_MSG_CHECKING(for DirectDraw LDFLAGS) + AC_LINK_IFELSE([ +#include +#include + +int main () +{ + GetStockObject(0); + DirectDrawCreate(NULL, NULL, NULL); + + return 0; +} +], + [HAVE_DIRECTDRAW="yes"], + [HAVE_DIRECTDRAW="no"]) + AC_MSG_RESULT($HAVE_DIRECTDRAW) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + + if test "x$HAVE_DIRECTDRAW" = "xyes"; then + dnl this is much more than we want + DIRECTDRAW_LIBS="-lddraw -ldxguid -lgdi32" + AC_SUBST(DIRECTDRAW_CFLAGS) + AC_SUBST(DIRECTDRAW_LDFLAGS) + AC_SUBST(DIRECTDRAW_LIBS) + fi + AC_SUBST(HAVE_DIRECTDRAW) +]) + +dnl DirectSound +translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTSOUND, true) +AG_GST_CHECK_FEATURE(DIRECTSOUND, [DirectSound plug-in], directsoundsink, [ + HAVE_DIRECTSOUND="no" + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $DIRECTSOUND_CFLAGS" + LDFLAGS="$LDFLAGS $DIRECTSOUND_LDFLAGS" + LIBS="$LIBS -ldsound -ldxerr9" + AC_MSG_CHECKING(for DirectSound LDFLAGS) + AC_LINK_IFELSE([ +#include +#include +#include + +int main () +{ + DXGetErrorString9 (0); + DirectSoundCreate(NULL, NULL, NULL); + + return 0; +} +], + [HAVE_DIRECTSOUND="yes"], + [HAVE_DIRECTSOUND="no"]) + AC_MSG_RESULT($HAVE_DIRECTSOUND) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + + if test "x$HAVE_DIRECTSOUND" = "xyes"; then + dnl this is much more than we want + DIRECTSOUND_LIBS="-ldsound -ldxerr9" + AC_SUBST(DIRECTSOUND_CFLAGS) + AC_SUBST(DIRECTSOUND_LDFLAGS) + AC_SUBST(DIRECTSOUND_LIBS) + fi + AC_SUBST(HAVE_DIRECTSOUND) +]) + dnl *** OSS audio *** (Linux, *BSD) translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) AG_GST_CHECK_FEATURE(OSS, [OSS audio], ossaudio, [ @@ -784,6 +865,8 @@ else dnl not building plugins with external dependencies, dnl but we still need to set the conditionals AM_CONDITIONAL(USE_GCONFTOOL, false) +AM_CONDITIONAL(USE_DIRECTDRAW, false) +AM_CONDITIONAL(USE_DIRECTSOUND, false) AM_CONDITIONAL(USE_OSS, false) AM_CONDITIONAL(USE_SUNAUDIO, false) AM_CONDITIONAL(USE_OSX_AUDIO, false) @@ -908,6 +991,8 @@ ext/shout2/Makefile ext/speex/Makefile ext/taglib/Makefile sys/Makefile +sys/directdraw/Makefile +sys/directsound/Makefile sys/oss/Makefile sys/sunaudio/Makefile sys/osxaudio/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index a21137d3..0e8eae06 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -119,6 +119,8 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/videofilter/gstvideoflip.h \ $(top_srcdir)/gst/videofilter/gstvideobalance.h \ $(top_srcdir)/gst/videomixer/videomixer.c \ + $(top_srcdir)/sys/directdraw/gstdirectdrawsink.h \ + $(top_srcdir)/sys/directsound/gstdirectsoundsink.h \ $(top_srcdir)/sys/oss/gstossmixerelement.h \ $(top_srcdir)/sys/oss/gstosssrc.h \ $(top_srcdir)/sys/oss/gstosssink.h \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index 7237112e..45f07ef5 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -27,6 +27,8 @@ + + @@ -80,6 +82,8 @@ + + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 8b6bae4b..76dd99c2 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -196,6 +196,22 @@ GST_IS_CDIO_CDDA_SRC_CLASS gst_cdio_cdda_src_get_type +
+element-directdrawsink +GstDirectDrawSink +directdrawsink + +GstDirectDrawSinkClass +
+ +
+element-directsoundsink +GstDirectSoundSink +directsoundsink + +GstDirectSoundSinkClass +
+
element-dvdec GstDVDec diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index 0486e22f..7539e559 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -16708,3 +16708,13 @@ 0 + +GstDirectDrawSink::force-aspect-ratio +gboolean + +rw +Force aspect ratio +When enabled, scaling will respect original aspect ratio. +FALSE + + diff --git a/sys/Makefile.am b/sys/Makefile.am index af7d9c96..0076cd57 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -10,6 +10,18 @@ else OSS_DIR= endif +if USE_DIRECTDRAW +DIRECTDRAW_DIR=directdraw +else +DIRECTDRAW_DIR= +endif + +if USE_DIRECTSOUND +DIRECTSOUND_DIR=directsound +else +DIRECTSOUND_DIR= +endif + if USE_SUNAUDIO SUNAUDIO_DIR=sunaudio else @@ -64,6 +76,6 @@ else XIMAGE_DIR= endif -SUBDIRS=$(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=oss osxaudio sunaudio v4l2 ximage +DIST_SUBDIRS=directdraw directsound oss osxaudio sunaudio v4l2 ximage diff --git a/win32/MANIFEST b/win32/MANIFEST index 49855d2a..70f7c3dd 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -12,6 +12,8 @@ win32/vs6/libgstauparse.dsp win32/vs6/libgstautodetect.dsp win32/vs6/libgstavi.dsp win32/vs6/libgstcutter.dsp +win32/vs6/libgstdirectdraw.dsp +win32/vs6/libgstdirectsound.dsp win32/vs6/libgsteffectv.dsp win32/vs6/libgstflx.dsp win32/vs6/libgstgoom.dsp @@ -36,6 +38,8 @@ win32/vs6/libgstvideoflip.dsp win32/vs6/libgstvideomixer.dsp win32/vs6/libgstwavenc.dsp win32/vs6/libgstwavparse.dsp +win32/vs7/libgstdirectdraw.vcproj +win32/vs7/libgstdirectsound.vcproj win32/vs8/gst-plugins-good.sln win32/vs8/libgst1394.vcproj win32/vs8/libgstaasink.vcproj @@ -51,6 +55,8 @@ win32/vs8/libgstavi.vcproj win32/vs8/libgstcacasink.vcproj win32/vs8/libgstcdio.vcproj win32/vs8/libgstcutter.vcproj +win32/vs8/libgstdirectdraw.vcproj +win32/vs8/libgstdirectsound.vcproj win32/vs8/libgstdv.vcproj win32/vs8/libgsteffectv.vcproj win32/vs8/libgstflac.vcproj -- cgit