diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2004-01-01 18:14:51 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2004-01-01 18:14:51 +0000 |
commit | 6fc61879fcde8b512d5654588bc8daa2fb13128e (patch) | |
tree | 84c442c3905af9aa974d8179236b8f86a89e51bf /src/audio_out/audio_directx_out.c | |
parent | 68651ae25728f746df6736cc7291179d60232315 (diff) | |
download | xine-lib-6fc61879fcde8b512d5654588bc8daa2fb13128e.tar.gz xine-lib-6fc61879fcde8b512d5654588bc8daa2fb13128e.tar.bz2 |
Win32 port, mainly DirectX:
* use DirectX under CygWin and basic auto-stuff
* move some my macros in configure.ac
* I don't know why, but shared directx plugins can't be linked with
libdxguid.a. Used cute-hack, idea is from mplayer. Also thanks to
hexedit, because I haven't sources of w32api.
* Fix some warnings in vo directx and ao directx.
* Decrease version of directx. It seems it still works.
For compilation with DirectX under Cygwin you need header files from
directx-sdk. Autoconf macros are only basic, but it works. for example:
DIRECTX_CFLAGS=-I/cygrive/c/Program\ Files/Directx/include ./autogen.sh
CVS patchset: 5971
CVS date: 2004/01/01 18:14:51
Diffstat (limited to 'src/audio_out/audio_directx_out.c')
-rwxr-xr-x | src/audio_out/audio_directx_out.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index df6c2b38c..8b0c327f8 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -20,15 +20,13 @@ * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: audio_directx_out.c,v 1.8 2003/12/14 22:13:22 siggi Exp $ + * $Id: audio_directx_out.c,v 1.9 2004/01/01 18:14:51 valtri Exp $ */ typedef unsigned char boolean; #include <windows.h> #include <dsound.h> -#include "audio_out.h" -#include "xine_internal.h" #define LOG_MODULE "audio_directx_out" #define LOG_VERBOSE @@ -36,6 +34,10 @@ typedef unsigned char boolean; #define LOG */ +#include "audio_out.h" +#include "xine_internal.h" + + #define MAX_CHANNELS 6 #define MAX_BITS 16 #define MAX_SAMPLE_RATE 44100 @@ -48,6 +50,18 @@ typedef unsigned char boolean; #define AO_DIRECTX_IFACE_VERSION 8 +/***************************************************************************** + * DirectDraw GUIDs. + * Defining them here allows us to get rid of the dxguid library during
+ * the linking stage. + *****************************************************************************/ +#if 1 +static const GUID IID_IDirectSoundNotify = { + 0xB0210783,0x89CD,0x11D0,{0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16} +}; +#endif + + /* ----------------------------------------- * * ao_directx driver struct @@ -804,7 +818,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da return ( ao_driver_t * ) ao_directx; } -static char* get_identifier (video_driver_class_t *this_gen) { +static char* get_identifier (audio_driver_class_t *this_gen) { return "DirectX"; } |