Mercurial > mxe-octave
changeset 857:97c67eaeabd5
merge
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Tue, 13 Apr 2010 03:33:28 +0200 |
| parents | 056787d36a35 (current diff) 950f750c266f (diff) |
| children | 772f74fbd0d7 |
| files | src/w32api-2-directx-additions-for-qt.patch src/w32api-directx-additions-of-qt.patch |
| diffstat | 5 files changed, 3665 insertions(+), 1299 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gst-plugins-good.mk Mon Apr 12 23:44:13 2010 +0200 +++ b/src/gst-plugins-good.mk Tue Apr 13 03:33:28 2010 +0200 @@ -10,7 +10,7 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc glib libxml2 gstreamer gst-plugins-base liboil libshout cairo directx flac gtk jpeg libpng speex taglib +$(PKG)_DEPS := gcc glib libxml2 gstreamer gst-plugins-base liboil libshout cairo flac gtk jpeg libpng speex taglib define $(PKG)_UPDATE wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-good/refs/tags' | \
--- a/src/portaudio.mk Mon Apr 12 23:44:13 2010 +0200 +++ b/src/portaudio.mk Tue Apr 13 03:33:28 2010 +0200 @@ -10,7 +10,7 @@ $(PKG)_FILE := pa_stable_v$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.portaudio.com $(PKG)_URL := http://www.portaudio.com/archives/$($(PKG)_FILE) -$(PKG)_DEPS := gcc directx +$(PKG)_DEPS := gcc define $(PKG)_UPDATE wget -q -O- 'http://www.portaudio.com/download.html' | \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/w32api-1-dsound.patch Tue Apr 13 03:33:28 2010 +0200 @@ -0,0 +1,2366 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch contains some DirectX additions for MinGW's w32api +which were provided by the Allegro project. It was generated +via the following commands: + +#--------------------------------------------------------------------# +wget -c 'http://alleg.sourceforge.net/files/dx80_mgw.zip' +mkdir -p a/include b/include +(cd b/include; unzip -aa -j ../../dx80_mgw.zip 'include/dsound.h') +diff -ruN a b > w32api-1-dsound.patch +rm -rf a b +rm -f dx80_mgw.zip +#--------------------------------------------------------------------# + + +diff -ruN a/include/dsound.h b/include/dsound.h +--- a/include/dsound.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/dsound.h 2000-10-21 02:27:56.000000000 +0200 +@@ -0,0 +1,2345 @@ ++/*==========================================================================; ++ * ++ * Copyright (C) 1995-2000 Microsoft Corporation. All Rights Reserved. ++ * ++ * File: dsound.h ++ * Content: DirectSound include file ++ * ++ **************************************************************************/ ++ ++#define COM_NO_WINDOWS_H ++#include <objbase.h> ++#include <float.h> ++ ++#ifndef DIRECTSOUND_VERSION ++#define DIRECTSOUND_VERSION 0x0800 /* Version 8.0 */ ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ ++#ifndef __DSOUND_INCLUDED__ ++#define __DSOUND_INCLUDED__ ++ ++/* Type definitions shared with Direct3D */ ++ ++#ifndef DX_SHARED_DEFINES ++ ++typedef float D3DVALUE, *LPD3DVALUE; ++ ++#ifndef D3DCOLOR_DEFINED ++typedef DWORD D3DCOLOR; ++#define D3DCOLOR_DEFINED ++#endif ++ ++#ifndef LPD3DCOLOR_DEFINED ++typedef DWORD *LPD3DCOLOR; ++#define LPD3DCOLOR_DEFINED ++#endif ++ ++#ifndef D3DVECTOR_DEFINED ++typedef struct _D3DVECTOR { ++ float x; ++ float y; ++ float z; ++} D3DVECTOR; ++#define D3DVECTOR_DEFINED ++#endif ++ ++#ifndef LPD3DVECTOR_DEFINED ++typedef D3DVECTOR *LPD3DVECTOR; ++#define LPD3DVECTOR_DEFINED ++#endif ++ ++#define DX_SHARED_DEFINES ++#endif // DX_SHARED_DEFINES ++ ++#define _FACDS 0x878 /* DirectSound's facility code */ ++#define MAKE_DSHRESULT(code) MAKE_HRESULT(1, _FACDS, code) ++ ++// DirectSound Component GUID {47D4D946-62E8-11CF-93BC-444553540000} ++DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0); ++ ++// DirectSound 8.0 Component GUID {3901CC3F-84B5-4FA4-BA35-AA8172B8A09B} ++DEFINE_GUID(CLSID_DirectSound8, 0x3901cc3f, 0x84b5, 0x4fa4, 0xba, 0x35, 0xaa, 0x81, 0x72, 0xb8, 0xa0, 0x9b); ++ ++// DirectSound Capture Component GUID {B0210780-89CD-11D0-AF08-00A0C925CD16} ++DEFINE_GUID(CLSID_DirectSoundCapture, 0xb0210780, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16); ++ ++// DirectSound 8.0 Capture Component GUID {E4BCAC13-7F99-4908-9A8E-74E3BF24B6E1} ++DEFINE_GUID(CLSID_DirectSoundCapture8, 0xe4bcac13, 0x7f99, 0x4908, 0x9a, 0x8e, 0x74, 0xe3, 0xbf, 0x24, 0xb6, 0xe1); ++ ++// DirectSound Full Duplex Component GUID {FEA4300C-7959-4147-B26A-2377B9E7A91D} ++DEFINE_GUID(CLSID_DirectSoundFullDuplex, 0xfea4300c, 0x7959, 0x4147, 0xb2, 0x6a, 0x23, 0x77, 0xb9, 0xe7, 0xa9, 0x1d); ++ ++ ++// DirectSound default playback device GUID {DEF00000-9C6D-47ED-AAF1-4DDA8F2B5C03} ++DEFINE_GUID(DSDEVID_DefaultPlayback, 0xdef00000, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03); ++ ++// DirectSound default capture device GUID {DEF00001-9C6D-47ED-AAF1-4DDA8F2B5C03} ++DEFINE_GUID(DSDEVID_DefaultCapture, 0xdef00001, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03); ++ ++// DirectSound default device for voice playback {DEF00002-9C6D-47ED-AAF1-4DDA8F2B5C03} ++DEFINE_GUID(DSDEVID_DefaultVoicePlayback, 0xdef00002, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03); ++ ++// DirectSound default device for voice capture {DEF00003-9C6D-47ED-AAF1-4DDA8F2B5C03} ++DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xdef00003, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03); ++ ++ ++// ++// Forward declarations for interfaces. ++// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined ++// ++ ++#ifdef __cplusplus ++struct IDirectSound; ++struct IDirectSoundBuffer; ++struct IDirectSound3DListener; ++struct IDirectSound3DBuffer; ++struct IDirectSoundCapture; ++struct IDirectSoundCaptureBuffer; ++struct IDirectSoundNotify; ++#endif // __cplusplus ++ ++ ++// ++// DirectSound 8.0 interfaces. ++// ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++#ifdef __cplusplus ++struct IDirectSound8; ++struct IDirectSoundBuffer8; ++struct IDirectSoundCaptureBuffer8; ++struct IDirectSoundFXGargle; ++struct IDirectSoundFXChorus; ++struct IDirectSoundFXFlanger; ++struct IDirectSoundFXEcho; ++struct IDirectSoundFXDistortion; ++struct IDirectSoundFXCompressor; ++struct IDirectSoundFXParamEq; ++struct IDirectSoundFXWavesReverb; ++struct IDirectSoundFXI3DL2Reverb; ++struct IDirectSoundCaptureFXAec; ++struct IDirectSoundCaptureFXNoiseSuppress; ++struct IDirectSoundFullDuplex; ++#endif // __cplusplus ++ ++// IDirectSound8, IDirectSoundBuffer8 and IDirectSoundCaptureBuffer8 are the ++// only DirectSound 7.0 interfaces with changed functionality in version 8.0. ++// The other level 8 interfaces as equivalent to their level 7 counterparts: ++ ++#define IDirectSoundCapture8 IDirectSoundCapture ++#define IDirectSound3DListener8 IDirectSound3DListener ++#define IDirectSound3DBuffer8 IDirectSound3DBuffer ++#define IDirectSoundNotify8 IDirectSoundNotify ++#define IDirectSoundFXGargle8 IDirectSoundFXGargle ++#define IDirectSoundFXChorus8 IDirectSoundFXChorus ++#define IDirectSoundFXFlanger8 IDirectSoundFXFlanger ++#define IDirectSoundFXEcho8 IDirectSoundFXEcho ++#define IDirectSoundFXDistortion8 IDirectSoundFXDistortion ++#define IDirectSoundFXCompressor8 IDirectSoundFXCompressor ++#define IDirectSoundFXParamEq8 IDirectSoundFXParamEq ++#define IDirectSoundFXWavesReverb8 IDirectSoundFXWavesReverb ++#define IDirectSoundFXI3DL2Reverb8 IDirectSoundFXI3DL2Reverb ++#define IDirectSoundCaptureFXAec8 IDirectSoundCaptureFXAec ++#define IDirectSoundCaptureFXNoiseSuppress8 IDirectSoundCaptureFXNoiseSuppress ++#define IDirectSoundFullDuplex8 IDirectSoundFullDuplex ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++ ++typedef struct IDirectSound *LPDIRECTSOUND; ++typedef struct IDirectSoundBuffer *LPDIRECTSOUNDBUFFER; ++typedef struct IDirectSound3DListener *LPDIRECTSOUND3DLISTENER; ++typedef struct IDirectSound3DBuffer *LPDIRECTSOUND3DBUFFER; ++typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE; ++typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER; ++typedef struct IDirectSoundNotify *LPDIRECTSOUNDNOTIFY; ++ ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++typedef struct IDirectSoundFXGargle *LPDIRECTSOUNDFXGARGLE; ++typedef struct IDirectSoundFXChorus *LPDIRECTSOUNDFXCHORUS; ++typedef struct IDirectSoundFXFlanger *LPDIRECTSOUNDFXFLANGER; ++typedef struct IDirectSoundFXEcho *LPDIRECTSOUNDFXECHO; ++typedef struct IDirectSoundFXDistortion *LPDIRECTSOUNDFXDISTORTION; ++typedef struct IDirectSoundFXCompressor *LPDIRECTSOUNDFXCOMPRESSOR; ++typedef struct IDirectSoundFXParamEq *LPDIRECTSOUNDFXPARAMEQ; ++typedef struct IDirectSoundFXWavesReverb *LPDIRECTSOUNDFXWAVESREVERB; ++typedef struct IDirectSoundFXI3DL2Reverb *LPDIRECTSOUNDFXI3DL2REVERB; ++typedef struct IDirectSoundCaptureFXAec *LPDIRECTSOUNDCAPTUREFXAEC; ++typedef struct IDirectSoundCaptureFXNoiseSuppress *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS; ++typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX; ++ ++typedef struct IDirectSound8 *LPDIRECTSOUND8; ++typedef struct IDirectSoundBuffer8 *LPDIRECTSOUNDBUFFER8; ++typedef struct IDirectSound3DListener8 *LPDIRECTSOUND3DLISTENER8; ++typedef struct IDirectSound3DBuffer8 *LPDIRECTSOUND3DBUFFER8; ++typedef struct IDirectSoundCapture8 *LPDIRECTSOUNDCAPTURE8; ++typedef struct IDirectSoundCaptureBuffer8 *LPDIRECTSOUNDCAPTUREBUFFER8; ++typedef struct IDirectSoundNotify8 *LPDIRECTSOUNDNOTIFY8; ++typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; ++typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; ++typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; ++typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; ++typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; ++typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; ++typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; ++typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; ++typedef struct IDirectSoundFXI3DL2Reverb8 *LPDIRECTSOUNDFXI3DL2REVERB8; ++typedef struct IDirectSoundCaptureFXAec8 *LPDIRECTSOUNDCAPTUREFXAEC8; ++typedef struct IDirectSoundCaptureFXNoiseSuppress8 *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS8; ++typedef struct IDirectSoundFullDuplex8 *LPDIRECTSOUNDFULLDUPLEX8; ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IID definitions for the unchanged DirectSound 8.0 interfaces ++// ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++#define IID_IDirectSoundCapture8 IID_IDirectSoundCapture ++#define IID_IDirectSound3DListener8 IID_IDirectSound3DListener ++#define IID_IDirectSound3DBuffer8 IID_IDirectSound3DBuffer ++#define IID_IDirectSoundNotify8 IID_IDirectSoundNotify ++#define IID_IDirectSoundFXGargle8 IID_IDirectSoundFXGargle ++#define IID_IDirectSoundFXChorus8 IID_IDirectSoundFXChorus ++#define IID_IDirectSoundFXFlanger8 IID_IDirectSoundFXFlanger ++#define IID_IDirectSoundFXEcho8 IID_IDirectSoundFXEcho ++#define IID_IDirectSoundFXDistortion8 IID_IDirectSoundFXDistortion ++#define IID_IDirectSoundFXCompressor8 IID_IDirectSoundFXCompressor ++#define IID_IDirectSoundFXParamEq8 IID_IDirectSoundFXParamEq ++#define IID_IDirectSoundFXWavesReverb8 IID_IDirectSoundFXWavesReverb ++#define IID_IDirectSoundFXI3DL2Reverb8 IID_IDirectSoundFXI3DL2Reverb ++#define IID_IDirectSoundCaptureFXAec8 IID_IDirectSoundCaptureFXAec ++#define IID_IDirectSoundCaptureFXNoiseSuppress8 IID_IDirectSoundCaptureFXNoiseSuppress ++#define IID_IDirectSoundFullDuplex8 IID_IDirectSoundFullDuplex ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// Compatibility typedefs ++// ++ ++#ifndef _LPCWAVEFORMATEX_DEFINED ++#define _LPCWAVEFORMATEX_DEFINED ++typedef const WAVEFORMATEX *LPCWAVEFORMATEX; ++#endif // _LPCWAVEFORMATEX_DEFINED ++ ++#ifndef __LPCGUID_DEFINED__ ++#define __LPCGUID_DEFINED__ ++typedef const GUID *LPCGUID; ++#endif // __LPCGUID_DEFINED__ ++ ++typedef LPDIRECTSOUND *LPLPDIRECTSOUND; ++typedef LPDIRECTSOUNDBUFFER *LPLPDIRECTSOUNDBUFFER; ++typedef LPDIRECTSOUND3DLISTENER *LPLPDIRECTSOUND3DLISTENER; ++typedef LPDIRECTSOUND3DBUFFER *LPLPDIRECTSOUND3DBUFFER; ++typedef LPDIRECTSOUNDCAPTURE *LPLPDIRECTSOUNDCAPTURE; ++typedef LPDIRECTSOUNDCAPTUREBUFFER *LPLPDIRECTSOUNDCAPTUREBUFFER; ++typedef LPDIRECTSOUNDNOTIFY *LPLPDIRECTSOUNDNOTIFY; ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++typedef LPDIRECTSOUND8 *LPLPDIRECTSOUND8; ++typedef LPDIRECTSOUNDBUFFER8 *LPLPDIRECTSOUNDBUFFER8; ++typedef LPDIRECTSOUNDCAPTURE8 *LPLPDIRECTSOUNDCAPTURE8; ++typedef LPDIRECTSOUNDCAPTUREBUFFER8 *LPLPDIRECTSOUNDCAPTUREBUFFER8; ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// Structures ++// ++ ++typedef struct _DSCAPS ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwMinSecondarySampleRate; ++ DWORD dwMaxSecondarySampleRate; ++ DWORD dwPrimaryBuffers; ++ DWORD dwMaxHwMixingAllBuffers; ++ DWORD dwMaxHwMixingStaticBuffers; ++ DWORD dwMaxHwMixingStreamingBuffers; ++ DWORD dwFreeHwMixingAllBuffers; ++ DWORD dwFreeHwMixingStaticBuffers; ++ DWORD dwFreeHwMixingStreamingBuffers; ++ DWORD dwMaxHw3DAllBuffers; ++ DWORD dwMaxHw3DStaticBuffers; ++ DWORD dwMaxHw3DStreamingBuffers; ++ DWORD dwFreeHw3DAllBuffers; ++ DWORD dwFreeHw3DStaticBuffers; ++ DWORD dwFreeHw3DStreamingBuffers; ++ DWORD dwTotalHwMemBytes; ++ DWORD dwFreeHwMemBytes; ++ DWORD dwMaxContigFreeHwMemBytes; ++ DWORD dwUnlockTransferRateHwBuffers; ++ DWORD dwPlayCpuOverheadSwBuffers; ++ DWORD dwReserved1; ++ DWORD dwReserved2; ++} DSCAPS, *LPDSCAPS; ++ ++typedef const DSCAPS *LPCDSCAPS; ++ ++typedef struct _DSBCAPS ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwUnlockTransferRate; ++ DWORD dwPlayCpuOverhead; ++} DSBCAPS, *LPDSBCAPS; ++ ++typedef const DSBCAPS *LPCDSBCAPS; ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++ typedef struct _DSEFFECTDESC ++ { ++ DWORD dwSize; ++ DWORD dwFlags; ++ GUID guidDSFXClass; ++ DWORD dwReserved1; ++ DWORD dwReserved2; ++ } DSEFFECTDESC, *LPDSEFFECTDESC; ++ typedef const DSEFFECTDESC *LPCDSEFFECTDESC; ++ ++ #define DSFX_LOCHARDWARE 0x00000001 ++ #define DSFX_LOCSOFTWARE 0x00000002 ++ ++ enum ++ { ++ DSFXR_PRESENT, // 0 ++ DSFXR_LOCHARDWARE, // 1 ++ DSFXR_LOCSOFTWARE, // 2 ++ DSFXR_UNALLOCATED, // 3 ++ DSFXR_FAILED, // 4 ++ DSFXR_UNKNOWN, // 5 ++ DSFXR_SENDLOOP // 6 ++ }; ++ ++ typedef struct _DSCEFFECTDESC ++ { ++ DWORD dwSize; ++ DWORD dwFlags; ++ GUID guidDSCFXClass; ++ GUID guidDSCFXInstance; ++ DWORD dwReserved1; ++ DWORD dwReserved2; ++ } DSCEFFECTDESC, *LPDSCEFFECTDESC; ++ typedef const DSCEFFECTDESC *LPCDSCEFFECTDESC; ++ ++ #define DSCFX_LOCHARDWARE 0x00000001 ++ #define DSCFX_LOCSOFTWARE 0x00000002 ++ ++ #define DSCFXR_LOCHARDWARE 0x00000010 ++ #define DSCFXR_LOCSOFTWARE 0x00000020 ++ #define DSCFXR_UNALLOCATED 0x00000040 ++ #define DSCFXR_FAILED 0x00000080 ++ #define DSCFXR_UNKNOWN 0x00000100 ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++typedef struct _DSBUFFERDESC ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwReserved; ++ LPWAVEFORMATEX lpwfxFormat; ++#if DIRECTSOUND_VERSION >= 0x0700 ++ GUID guid3DAlgorithm; ++#endif ++} DSBUFFERDESC, *LPDSBUFFERDESC; ++ ++typedef const DSBUFFERDESC *LPCDSBUFFERDESC; ++ ++// Older version of this structure: ++ ++typedef struct _DSBUFFERDESC1 ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwReserved; ++ LPWAVEFORMATEX lpwfxFormat; ++} DSBUFFERDESC1, *LPDSBUFFERDESC1; ++ ++typedef const DSBUFFERDESC1 *LPCDSBUFFERDESC1; ++ ++typedef struct _DS3DBUFFER ++{ ++ DWORD dwSize; ++ D3DVECTOR vPosition; ++ D3DVECTOR vVelocity; ++ DWORD dwInsideConeAngle; ++ DWORD dwOutsideConeAngle; ++ D3DVECTOR vConeOrientation; ++ LONG lConeOutsideVolume; ++ D3DVALUE flMinDistance; ++ D3DVALUE flMaxDistance; ++ DWORD dwMode; ++} DS3DBUFFER, *LPDS3DBUFFER; ++ ++typedef const DS3DBUFFER *LPCDS3DBUFFER; ++ ++typedef struct _DS3DLISTENER ++{ ++ DWORD dwSize; ++ D3DVECTOR vPosition; ++ D3DVECTOR vVelocity; ++ D3DVECTOR vOrientFront; ++ D3DVECTOR vOrientTop; ++ D3DVALUE flDistanceFactor; ++ D3DVALUE flRolloffFactor; ++ D3DVALUE flDopplerFactor; ++} DS3DLISTENER, *LPDS3DLISTENER; ++ ++typedef const DS3DLISTENER *LPCDS3DLISTENER; ++ ++typedef struct _DSCCAPS ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwFormats; ++ DWORD dwChannels; ++} DSCCAPS, *LPDSCCAPS; ++ ++typedef const DSCCAPS *LPCDSCCAPS; ++ ++typedef struct _DSCBUFFERDESC1 ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwReserved; ++ LPWAVEFORMATEX lpwfxFormat; ++} DSCBUFFERDESC1, *LPDSCBUFFERDESC1; ++ ++typedef struct _DSCBUFFERDESC ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwReserved; ++ LPWAVEFORMATEX lpwfxFormat; ++#if DIRECTSOUND_VERSION >= 0x0800 ++ DWORD dwFXCount; ++ LPDSCEFFECTDESC lpDSCFXDesc; ++#endif ++} DSCBUFFERDESC, *LPDSCBUFFERDESC; ++ ++typedef const DSCBUFFERDESC *LPCDSCBUFFERDESC; ++ ++typedef struct _DSCBCAPS ++{ ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwBufferBytes; ++ DWORD dwReserved; ++} DSCBCAPS, *LPDSCBCAPS; ++ ++typedef const DSCBCAPS *LPCDSCBCAPS; ++ ++typedef struct _DSBPOSITIONNOTIFY ++{ ++ DWORD dwOffset; ++ HANDLE hEventNotify; ++} DSBPOSITIONNOTIFY, *LPDSBPOSITIONNOTIFY; ++ ++typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY; ++ ++// ++// DirectSound API ++// ++ ++typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID, LPCSTR, LPCSTR, LPVOID); ++typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID, LPCWSTR, LPCWSTR, LPVOID); ++ ++extern HRESULT WINAPI DirectSoundCreate(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter); ++extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext); ++extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext); ++ ++extern HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE *ppDSC, LPUNKNOWN pUnkOuter); ++extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext); ++extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext); ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++extern HRESULT WINAPI DirectSoundCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUND8 *ppDS8, LPUNKNOWN pUnkOuter); ++extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter); ++extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice, ++ LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd, ++ DWORD dwLevel, LPDIRECTSOUNDFULLDUPLEX* ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, ++ LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter); ++#define DirectSoundFullDuplexCreate8 DirectSoundFullDuplexCreate ++ ++extern HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest); ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++#ifdef UNICODE ++#define LPDSENUMCALLBACK LPDSENUMCALLBACKW ++#define DirectSoundEnumerate DirectSoundEnumerateW ++#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateW ++#else // UNICODE ++#define LPDSENUMCALLBACK LPDSENUMCALLBACKA ++#define DirectSoundEnumerate DirectSoundEnumerateA ++#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateA ++#endif // UNICODE ++ ++// ++// IUnknown ++// ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#ifndef IUnknown_QueryInterface ++#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) ++#endif // IUnknown_QueryInterface ++#ifndef IUnknown_AddRef ++#define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p) ++#endif // IUnknown_AddRef ++#ifndef IUnknown_Release ++#define IUnknown_Release(p) (p)->lpVtbl->Release(p) ++#endif // IUnknown_Release ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#ifndef IUnknown_QueryInterface ++#define IUnknown_QueryInterface(p,a,b) (p)->QueryInterface(a,b) ++#endif // IUnknown_QueryInterface ++#ifndef IUnknown_AddRef ++#define IUnknown_AddRef(p) (p)->AddRef() ++#endif // IUnknown_AddRef ++#ifndef IUnknown_Release ++#define IUnknown_Release(p) (p)->Release() ++#endif // IUnknown_Release ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#ifndef __IReferenceClock_INTERFACE_DEFINED__ ++#define __IReferenceClock_INTERFACE_DEFINED__ ++ ++typedef LONGLONG REFERENCE_TIME; ++typedef REFERENCE_TIME *LPREFERENCE_TIME; ++ ++DEFINE_GUID(IID_IReferenceClock, 0x56a86897, 0x0ad4, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++ ++#undef INTERFACE ++#define INTERFACE IReferenceClock ++ ++DECLARE_INTERFACE_(IReferenceClock, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IReferenceClock methods ++ STDMETHOD(GetTime) (THIS_ REFERENCE_TIME *pTime) PURE; ++ STDMETHOD(AdviseTime) (THIS_ REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, ++ HANDLE hEvent, LPDWORD pdwAdviseCookie) PURE; ++ STDMETHOD(AdvisePeriodic) (THIS_ REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime, ++ HANDLE hSemaphore, LPDWORD pdwAdviseCookie) PURE; ++ STDMETHOD(Unadvise) (THIS_ DWORD dwAdviseCookie) PURE; ++}; ++ ++#endif // __IReferenceClock_INTERFACE_DEFINED__ ++ ++#ifndef IReferenceClock_QueryInterface ++ ++#define IReferenceClock_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IReferenceClock_AddRef(p) IUnknown_AddRef(p) ++#define IReferenceClock_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IReferenceClock_GetTime(p,a) (p)->lpVtbl->GetTime(p,a) ++#define IReferenceClock_AdviseTime(p,a,b,c,d) (p)->lpVtbl->AdviseTime(p,a,b,c,d) ++#define IReferenceClock_AdvisePeriodic(p,a,b,c,d) (p)->lpVtbl->AdvisePeriodic(p,a,b,c,d) ++#define IReferenceClock_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IReferenceClock_GetTime(p,a) (p)->GetTime(a) ++#define IReferenceClock_AdviseTime(p,a,b,c,d) (p)->AdviseTime(a,b,c,d) ++#define IReferenceClock_AdvisePeriodic(p,a,b,c,d) (p)->AdvisePeriodic(a,b,c,d) ++#define IReferenceClock_Unadvise(p,a) (p)->Unadvise(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // IReferenceClock_QueryInterface ++ ++// ++// IDirectSound ++// ++ ++DEFINE_GUID(IID_IDirectSound, 0x279AFA83, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSound ++ ++DECLARE_INTERFACE_(IDirectSound, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSound methods ++ STDMETHOD(CreateSoundBuffer) (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE; ++ STDMETHOD(GetCaps) (THIS_ LPDSCAPS pDSCaps) PURE; ++ STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE; ++ STDMETHOD(SetCooperativeLevel) (THIS_ HWND hwnd, DWORD dwLevel) PURE; ++ STDMETHOD(Compact) (THIS) PURE; ++ STDMETHOD(GetSpeakerConfig) (THIS_ LPDWORD pdwSpeakerConfig) PURE; ++ STDMETHOD(SetSpeakerConfig) (THIS_ DWORD dwSpeakerConfig) PURE; ++ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE; ++}; ++ ++#define IDirectSound_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSound_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSound_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->lpVtbl->CreateSoundBuffer(p,a,b,c) ++#define IDirectSound_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a) ++#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b) ++#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b) ++#define IDirectSound_Compact(p) (p)->lpVtbl->Compact(p) ++#define IDirectSound_GetSpeakerConfig(p,a) (p)->lpVtbl->GetSpeakerConfig(p,a) ++#define IDirectSound_SetSpeakerConfig(p,b) (p)->lpVtbl->SetSpeakerConfig(p,b) ++#define IDirectSound_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->CreateSoundBuffer(a,b,c) ++#define IDirectSound_GetCaps(p,a) (p)->GetCaps(a) ++#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->DuplicateSoundBuffer(a,b) ++#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b) ++#define IDirectSound_Compact(p) (p)->Compact() ++#define IDirectSound_GetSpeakerConfig(p,a) (p)->GetSpeakerConfig(a) ++#define IDirectSound_SetSpeakerConfig(p,b) (p)->SetSpeakerConfig(b) ++#define IDirectSound_Initialize(p,a) (p)->Initialize(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSound8 ++// ++ ++DEFINE_GUID(IID_IDirectSound8, 0xC50A7E93, 0xF395, 0x4834, 0x9E, 0xF6, 0x7F, 0xA9, 0x9D, 0xE5, 0x09, 0x66); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSound8 ++ ++DECLARE_INTERFACE_(IDirectSound8, IDirectSound) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSound methods ++ STDMETHOD(CreateSoundBuffer) (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE; ++ STDMETHOD(GetCaps) (THIS_ LPDSCAPS pDSCaps) PURE; ++ STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE; ++ STDMETHOD(SetCooperativeLevel) (THIS_ HWND hwnd, DWORD dwLevel) PURE; ++ STDMETHOD(Compact) (THIS) PURE; ++ STDMETHOD(GetSpeakerConfig) (THIS_ LPDWORD pdwSpeakerConfig) PURE; ++ STDMETHOD(SetSpeakerConfig) (THIS_ DWORD dwSpeakerConfig) PURE; ++ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE; ++ ++ // IDirectSound8 methods ++ STDMETHOD(VerifyCertification) (THIS_ LPDWORD pdwCertified) PURE; ++}; ++ ++#define IDirectSound8_QueryInterface(p,a,b) IDirectSound_QueryInterface(p,a,b) ++#define IDirectSound8_AddRef(p) IDirectSound_AddRef(p) ++#define IDirectSound8_Release(p) IDirectSound_Release(p) ++#define IDirectSound8_CreateSoundBuffer(p,a,b,c) IDirectSound_CreateSoundBuffer(p,a,b,c) ++#define IDirectSound8_GetCaps(p,a) IDirectSound_GetCaps(p,a) ++#define IDirectSound8_DuplicateSoundBuffer(p,a,b) IDirectSound_DuplicateSoundBuffer(p,a,b) ++#define IDirectSound8_SetCooperativeLevel(p,a,b) IDirectSound_SetCooperativeLevel(p,a,b) ++#define IDirectSound8_Compact(p) IDirectSound_Compact(p) ++#define IDirectSound8_GetSpeakerConfig(p,a) IDirectSound_GetSpeakerConfig(p,a) ++#define IDirectSound8_SetSpeakerConfig(p,a) IDirectSound_SetSpeakerConfig(p,a) ++#define IDirectSound8_Initialize(p,a) IDirectSound_Initialize(p,a) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound8_VerifyCertification(p,a) (p)->lpVtbl->VerifyCertification(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound8_VerifyCertification(p,a) (p)->VerifyCertification(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSoundBuffer ++// ++ ++DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundBuffer ++ ++DECLARE_INTERFACE_(IDirectSoundBuffer, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundBuffer methods ++ STDMETHOD(GetCaps) (THIS_ LPDSBCAPS pDSBufferCaps) PURE; ++ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE; ++ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE; ++ STDMETHOD(GetVolume) (THIS_ LPLONG plVolume) PURE; ++ STDMETHOD(GetPan) (THIS_ LPLONG plPan) PURE; ++ STDMETHOD(GetFrequency) (THIS_ LPDWORD pdwFrequency) PURE; ++ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE; ++ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE; ++ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, ++ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; ++ STDMETHOD(Play) (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE; ++ STDMETHOD(SetCurrentPosition) (THIS_ DWORD dwNewPosition) PURE; ++ STDMETHOD(SetFormat) (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE; ++ STDMETHOD(SetVolume) (THIS_ LONG lVolume) PURE; ++ STDMETHOD(SetPan) (THIS_ LONG lPan) PURE; ++ STDMETHOD(SetFrequency) (THIS_ DWORD dwFrequency) PURE; ++ STDMETHOD(Stop) (THIS) PURE; ++ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE; ++ STDMETHOD(Restore) (THIS) PURE; ++}; ++ ++#define IDirectSoundBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundBuffer_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundBuffer_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a) ++#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b) ++#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c) ++#define IDirectSoundBuffer_GetVolume(p,a) (p)->lpVtbl->GetVolume(p,a) ++#define IDirectSoundBuffer_GetPan(p,a) (p)->lpVtbl->GetPan(p,a) ++#define IDirectSoundBuffer_GetFrequency(p,a) (p)->lpVtbl->GetFrequency(p,a) ++#define IDirectSoundBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a) ++#define IDirectSoundBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) ++#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g) ++#define IDirectSoundBuffer_Play(p,a,b,c) (p)->lpVtbl->Play(p,a,b,c) ++#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->lpVtbl->SetCurrentPosition(p,a) ++#define IDirectSoundBuffer_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) ++#define IDirectSoundBuffer_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a) ++#define IDirectSoundBuffer_SetPan(p,a) (p)->lpVtbl->SetPan(p,a) ++#define IDirectSoundBuffer_SetFrequency(p,a) (p)->lpVtbl->SetFrequency(p,a) ++#define IDirectSoundBuffer_Stop(p) (p)->lpVtbl->Stop(p) ++#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d) ++#define IDirectSoundBuffer_Restore(p) (p)->lpVtbl->Restore(p) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundBuffer_GetCaps(p,a) (p)->GetCaps(a) ++#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b) ++#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c) ++#define IDirectSoundBuffer_GetVolume(p,a) (p)->GetVolume(a) ++#define IDirectSoundBuffer_GetPan(p,a) (p)->GetPan(a) ++#define IDirectSoundBuffer_GetFrequency(p,a) (p)->GetFrequency(a) ++#define IDirectSoundBuffer_GetStatus(p,a) (p)->GetStatus(a) ++#define IDirectSoundBuffer_Initialize(p,a,b) (p)->Initialize(a,b) ++#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g) ++#define IDirectSoundBuffer_Play(p,a,b,c) (p)->Play(a,b,c) ++#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->SetCurrentPosition(a) ++#define IDirectSoundBuffer_SetFormat(p,a) (p)->SetFormat(a) ++#define IDirectSoundBuffer_SetVolume(p,a) (p)->SetVolume(a) ++#define IDirectSoundBuffer_SetPan(p,a) (p)->SetPan(a) ++#define IDirectSoundBuffer_SetFrequency(p,a) (p)->SetFrequency(a) ++#define IDirectSoundBuffer_Stop(p) (p)->Stop() ++#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d) ++#define IDirectSoundBuffer_Restore(p) (p)->Restore() ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSoundBuffer8 ++// ++ ++DEFINE_GUID(IID_IDirectSoundBuffer8, 0x6825a449, 0x7524, 0x4d82, 0x92, 0x0f, 0x50, 0xe3, 0x6a, 0xb3, 0xab, 0x1e); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundBuffer8 ++ ++DECLARE_INTERFACE_(IDirectSoundBuffer8, IDirectSoundBuffer) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundBuffer methods ++ STDMETHOD(GetCaps) (THIS_ LPDSBCAPS pDSBufferCaps) PURE; ++ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE; ++ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE; ++ STDMETHOD(GetVolume) (THIS_ LPLONG plVolume) PURE; ++ STDMETHOD(GetPan) (THIS_ LPLONG plPan) PURE; ++ STDMETHOD(GetFrequency) (THIS_ LPDWORD pdwFrequency) PURE; ++ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE; ++ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE; ++ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, ++ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; ++ STDMETHOD(Play) (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE; ++ STDMETHOD(SetCurrentPosition) (THIS_ DWORD dwNewPosition) PURE; ++ STDMETHOD(SetFormat) (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE; ++ STDMETHOD(SetVolume) (THIS_ LONG lVolume) PURE; ++ STDMETHOD(SetPan) (THIS_ LONG lPan) PURE; ++ STDMETHOD(SetFrequency) (THIS_ DWORD dwFrequency) PURE; ++ STDMETHOD(Stop) (THIS) PURE; ++ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE; ++ STDMETHOD(Restore) (THIS) PURE; ++ ++ // IDirectSoundBuffer8 methods ++ STDMETHOD(SetFX) (THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE; ++ STDMETHOD(AcquireResources) (THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE; ++ STDMETHOD(GetObjectInPath) (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE; ++}; ++ ++// Special GUID meaning "select all objects" for use in GetObjectInPath() ++DEFINE_GUID(GUID_All_Objects, 0xaa114de5, 0xc262, 0x4169, 0xa1, 0xc8, 0x23, 0xd6, 0x98, 0xcc, 0x73, 0xb5); ++ ++#define IDirectSoundBuffer8_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundBuffer8_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundBuffer8_Release(p) IUnknown_Release(p) ++ ++#define IDirectSoundBuffer8_GetCaps(p,a) IDirectSoundBuffer_GetCaps(p,a) ++#define IDirectSoundBuffer8_GetCurrentPosition(p,a,b) IDirectSoundBuffer_GetCurrentPosition(p,a,b) ++#define IDirectSoundBuffer8_GetFormat(p,a,b,c) IDirectSoundBuffer_GetFormat(p,a,b,c) ++#define IDirectSoundBuffer8_GetVolume(p,a) IDirectSoundBuffer_GetVolume(p,a) ++#define IDirectSoundBuffer8_GetPan(p,a) IDirectSoundBuffer_GetPan(p,a) ++#define IDirectSoundBuffer8_GetFrequency(p,a) IDirectSoundBuffer_GetFrequency(p,a) ++#define IDirectSoundBuffer8_GetStatus(p,a) IDirectSoundBuffer_GetStatus(p,a) ++#define IDirectSoundBuffer8_Initialize(p,a,b) IDirectSoundBuffer_Initialize(p,a,b) ++#define IDirectSoundBuffer8_Lock(p,a,b,c,d,e,f,g) IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) ++#define IDirectSoundBuffer8_Play(p,a,b,c) IDirectSoundBuffer_Play(p,a,b,c) ++#define IDirectSoundBuffer8_SetCurrentPosition(p,a) IDirectSoundBuffer_SetCurrentPosition(p,a) ++#define IDirectSoundBuffer8_SetFormat(p,a) IDirectSoundBuffer_SetFormat(p,a) ++#define IDirectSoundBuffer8_SetVolume(p,a) IDirectSoundBuffer_SetVolume(p,a) ++#define IDirectSoundBuffer8_SetPan(p,a) IDirectSoundBuffer_SetPan(p,a) ++#define IDirectSoundBuffer8_SetFrequency(p,a) IDirectSoundBuffer_SetFrequency(p,a) ++#define IDirectSoundBuffer8_Stop(p) IDirectSoundBuffer_Stop(p) ++#define IDirectSoundBuffer8_Unlock(p,a,b,c,d) IDirectSoundBuffer_Unlock(p,a,b,c,d) ++#define IDirectSoundBuffer8_Restore(p) IDirectSoundBuffer_Restore(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->lpVtbl->SetFX(p,a,b,c) ++#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->lpVtbl->AcquireResources(p,a,b,c) ++#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->SetFX(a,b,c) ++#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->AcquireResources(a,b,c) ++#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSound3DListener ++// ++ ++DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSound3DListener ++ ++DECLARE_INTERFACE_(IDirectSound3DListener, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSound3DListener methods ++ STDMETHOD(GetAllParameters) (THIS_ LPDS3DLISTENER pListener) PURE; ++ STDMETHOD(GetDistanceFactor) (THIS_ D3DVALUE* pflDistanceFactor) PURE; ++ STDMETHOD(GetDopplerFactor) (THIS_ D3DVALUE* pflDopplerFactor) PURE; ++ STDMETHOD(GetOrientation) (THIS_ D3DVECTOR* pvOrientFront, D3DVECTOR* pvOrientTop) PURE; ++ STDMETHOD(GetPosition) (THIS_ D3DVECTOR* pvPosition) PURE; ++ STDMETHOD(GetRolloffFactor) (THIS_ D3DVALUE* pflRolloffFactor) PURE; ++ STDMETHOD(GetVelocity) (THIS_ D3DVECTOR* pvVelocity) PURE; ++ STDMETHOD(SetAllParameters) (THIS_ LPCDS3DLISTENER pcListener, DWORD dwApply) PURE; ++ STDMETHOD(SetDistanceFactor) (THIS_ D3DVALUE flDistanceFactor, DWORD dwApply) PURE; ++ STDMETHOD(SetDopplerFactor) (THIS_ D3DVALUE flDopplerFactor, DWORD dwApply) PURE; ++ STDMETHOD(SetOrientation) (THIS_ D3DVALUE xFront, D3DVALUE yFront, D3DVALUE zFront, ++ D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop, DWORD dwApply) PURE; ++ STDMETHOD(SetPosition) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; ++ STDMETHOD(SetRolloffFactor) (THIS_ D3DVALUE flRolloffFactor, DWORD dwApply) PURE; ++ STDMETHOD(SetVelocity) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; ++ STDMETHOD(CommitDeferredSettings) (THIS) PURE; ++}; ++ ++#define IDirectSound3DListener_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSound3DListener_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSound3DListener_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound3DListener_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->lpVtbl->GetDistanceFactor(p,a) ++#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->lpVtbl->GetDopplerFactor(p,a) ++#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->lpVtbl->GetOrientation(p,a,b) ++#define IDirectSound3DListener_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a) ++#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->lpVtbl->GetRolloffFactor(p,a) ++#define IDirectSound3DListener_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a) ++#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b) ++#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->lpVtbl->SetDistanceFactor(p,a,b) ++#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->lpVtbl->SetDopplerFactor(p,a,b) ++#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->lpVtbl->SetOrientation(p,a,b,c,d,e,f,g) ++#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d) ++#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->lpVtbl->SetRolloffFactor(p,a,b) ++#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d) ++#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->lpVtbl->CommitDeferredSettings(p) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound3DListener_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->GetDistanceFactor(a) ++#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->GetDopplerFactor(a) ++#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->GetOrientation(a,b) ++#define IDirectSound3DListener_GetPosition(p,a) (p)->GetPosition(a) ++#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->GetRolloffFactor(a) ++#define IDirectSound3DListener_GetVelocity(p,a) (p)->GetVelocity(a) ++#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b) ++#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->SetDistanceFactor(a,b) ++#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->SetDopplerFactor(a,b) ++#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->SetOrientation(a,b,c,d,e,f,g) ++#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d) ++#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->SetRolloffFactor(a,b) ++#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d) ++#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->CommitDeferredSettings() ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSound3DBuffer ++// ++ ++DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSound3DBuffer ++ ++DECLARE_INTERFACE_(IDirectSound3DBuffer, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSound3DBuffer methods ++ STDMETHOD(GetAllParameters) (THIS_ LPDS3DBUFFER pDs3dBuffer) PURE; ++ STDMETHOD(GetConeAngles) (THIS_ LPDWORD pdwInsideConeAngle, LPDWORD pdwOutsideConeAngle) PURE; ++ STDMETHOD(GetConeOrientation) (THIS_ D3DVECTOR* pvOrientation) PURE; ++ STDMETHOD(GetConeOutsideVolume) (THIS_ LPLONG plConeOutsideVolume) PURE; ++ STDMETHOD(GetMaxDistance) (THIS_ D3DVALUE* pflMaxDistance) PURE; ++ STDMETHOD(GetMinDistance) (THIS_ D3DVALUE* pflMinDistance) PURE; ++ STDMETHOD(GetMode) (THIS_ LPDWORD pdwMode) PURE; ++ STDMETHOD(GetPosition) (THIS_ D3DVECTOR* pvPosition) PURE; ++ STDMETHOD(GetVelocity) (THIS_ D3DVECTOR* pvVelocity) PURE; ++ STDMETHOD(SetAllParameters) (THIS_ LPCDS3DBUFFER pcDs3dBuffer, DWORD dwApply) PURE; ++ STDMETHOD(SetConeAngles) (THIS_ DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply) PURE; ++ STDMETHOD(SetConeOrientation) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; ++ STDMETHOD(SetConeOutsideVolume) (THIS_ LONG lConeOutsideVolume, DWORD dwApply) PURE; ++ STDMETHOD(SetMaxDistance) (THIS_ D3DVALUE flMaxDistance, DWORD dwApply) PURE; ++ STDMETHOD(SetMinDistance) (THIS_ D3DVALUE flMinDistance, DWORD dwApply) PURE; ++ STDMETHOD(SetMode) (THIS_ DWORD dwMode, DWORD dwApply) PURE; ++ STDMETHOD(SetPosition) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; ++ STDMETHOD(SetVelocity) (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; ++}; ++ ++#define IDirectSound3DBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSound3DBuffer_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSound3DBuffer_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->lpVtbl->GetConeAngles(p,a,b) ++#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->lpVtbl->GetConeOrientation(p,a) ++#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->lpVtbl->GetConeOutsideVolume(p,a) ++#define IDirectSound3DBuffer_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a) ++#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->lpVtbl->GetMinDistance(p,a) ++#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->lpVtbl->GetMaxDistance(p,a) ++#define IDirectSound3DBuffer_GetMode(p,a) (p)->lpVtbl->GetMode(p,a) ++#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a) ++#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b) ++#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->lpVtbl->SetConeAngles(p,a,b,c) ++#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->lpVtbl->SetConeOrientation(p,a,b,c,d) ++#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->lpVtbl->SetConeOutsideVolume(p,a,b) ++#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d) ++#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->lpVtbl->SetMinDistance(p,a,b) ++#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->lpVtbl->SetMaxDistance(p,a,b) ++#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->lpVtbl->SetMode(p,a,b) ++#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->GetConeAngles(a,b) ++#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->GetConeOrientation(a) ++#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->GetConeOutsideVolume(a) ++#define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a) ++#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->GetMinDistance(a) ++#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->GetMaxDistance(a) ++#define IDirectSound3DBuffer_GetMode(p,a) (p)->GetMode(a) ++#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a) ++#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b) ++#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c) ++#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d) ++#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b) ++#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d) ++#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->SetMinDistance(a,b) ++#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b) ++#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->SetMode(a,b) ++#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundCapture ++// ++ ++DEFINE_GUID(IID_IDirectSoundCapture, 0xb0210781, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundCapture ++ ++DECLARE_INTERFACE_(IDirectSoundCapture, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundCapture methods ++ STDMETHOD(CreateCaptureBuffer) (THIS_ LPCDSCBUFFERDESC pcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER *ppDSCBuffer, LPUNKNOWN pUnkOuter) PURE; ++ STDMETHOD(GetCaps) (THIS_ LPDSCCAPS pDSCCaps) PURE; ++ STDMETHOD(Initialize) (THIS_ LPCGUID pcGuidDevice) PURE; ++}; ++ ++#define IDirectSoundCapture_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundCapture_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundCapture_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->lpVtbl->CreateCaptureBuffer(p,a,b,c) ++#define IDirectSoundCapture_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a) ++#define IDirectSoundCapture_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->CreateCaptureBuffer(a,b,c) ++#define IDirectSoundCapture_GetCaps(p,a) (p)->GetCaps(a) ++#define IDirectSoundCapture_Initialize(p,a) (p)->Initialize(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundCaptureBuffer ++// ++ ++DEFINE_GUID(IID_IDirectSoundCaptureBuffer, 0xb0210782, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundCaptureBuffer ++ ++DECLARE_INTERFACE_(IDirectSoundCaptureBuffer, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundCaptureBuffer methods ++ STDMETHOD(GetCaps) (THIS_ LPDSCBCAPS pDSCBCaps) PURE; ++ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE; ++ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE; ++ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE; ++ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE; ++ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, ++ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; ++ STDMETHOD(Start) (THIS_ DWORD dwFlags) PURE; ++ STDMETHOD(Stop) (THIS) PURE; ++ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE; ++}; ++ ++#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundCaptureBuffer_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundCaptureBuffer_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a) ++#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b) ++#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c) ++#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a) ++#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) ++#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g) ++#define IDirectSoundCaptureBuffer_Start(p,a) (p)->lpVtbl->Start(p,a) ++#define IDirectSoundCaptureBuffer_Stop(p) (p)->lpVtbl->Stop(p) ++#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->GetCaps(a) ++#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b) ++#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c) ++#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->GetStatus(a) ++#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->Initialize(a,b) ++#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g) ++#define IDirectSoundCaptureBuffer_Start(p,a) (p)->Start(a) ++#define IDirectSoundCaptureBuffer_Stop(p) (p)->Stop() ++#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSoundCaptureBuffer8 ++// ++ ++DEFINE_GUID(IID_IDirectSoundCaptureBuffer8, 0x990df4, 0xdbb, 0x4872, 0x83, 0x3e, 0x6d, 0x30, 0x3e, 0x80, 0xae, 0xb6); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundCaptureBuffer8 ++ ++DECLARE_INTERFACE_(IDirectSoundCaptureBuffer8, IDirectSoundCaptureBuffer) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundCaptureBuffer methods ++ STDMETHOD(GetCaps) (THIS_ LPDSCBCAPS pDSCBCaps) PURE; ++ STDMETHOD(GetCurrentPosition) (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE; ++ STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE; ++ STDMETHOD(GetStatus) (THIS_ LPDWORD pdwStatus) PURE; ++ STDMETHOD(Initialize) (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE; ++ STDMETHOD(Lock) (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, ++ LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; ++ STDMETHOD(Start) (THIS_ DWORD dwFlags) PURE; ++ STDMETHOD(Stop) (THIS) PURE; ++ STDMETHOD(Unlock) (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE; ++ ++ // IDirectSoundCaptureBuffer8 methods ++ STDMETHOD(GetObjectInPath) (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE; ++ STDMETHOD(GetFXStatus) (DWORD dwFXCount, LPDWORD pdwFXStatus) PURE; ++}; ++ ++#define IDirectSoundCaptureBuffer8_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundCaptureBuffer8_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundCaptureBuffer8_Release(p) IUnknown_Release(p) ++ ++#define IDirectSoundCaptureBuffer8_GetCaps(p,a) IDirectSoundCaptureBuffer_GetCaps(p,a) ++#define IDirectSoundCaptureBuffer8_GetCurrentPosition(p,a,b) IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) ++#define IDirectSoundCaptureBuffer8_GetFormat(p,a,b,c) IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) ++#define IDirectSoundCaptureBuffer8_GetStatus(p,a) IDirectSoundCaptureBuffer_GetStatus(p,a) ++#define IDirectSoundCaptureBuffer8_Initialize(p,a,b) IDirectSoundCaptureBuffer_Initialize(p,a,b) ++#define IDirectSoundCaptureBuffer8_Lock(p,a,b,c,d,e,f,g) IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) ++#define IDirectSoundCaptureBuffer8_Start(p,a) IDirectSoundCaptureBuffer_Start(p,a) ++#define IDirectSoundCaptureBuffer8_Stop(p) IDirectSoundCaptureBuffer_Stop(p)) ++#define IDirectSoundCaptureBuffer8_Unlock(p,a,b,c,d) IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d) ++#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->lpVtbl->GetFXStatus(p,a,b) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d) ++#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->GetFXStatus(a,b) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSoundNotify ++// ++ ++DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundNotify ++ ++DECLARE_INTERFACE_(IDirectSoundNotify, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundNotify methods ++ STDMETHOD(SetNotificationPositions) (THIS_ DWORD dwPositionNotifies, LPCDSBPOSITIONNOTIFY pcPositionNotifies) PURE; ++}; ++ ++#define IDirectSoundNotify_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundNotify_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundNotify_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->lpVtbl->SetNotificationPositions(p,a,b) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->SetNotificationPositions(a,b) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IKsPropertySet ++// ++ ++#ifndef _IKsPropertySet_ ++#define _IKsPropertySet_ ++ ++#ifdef __cplusplus ++// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined ++struct IKsPropertySet; ++#endif // __cplusplus ++ ++typedef struct IKsPropertySet *LPKSPROPERTYSET; ++ ++#define KSPROPERTY_SUPPORT_GET 0x00000001 ++#define KSPROPERTY_SUPPORT_SET 0x00000002 ++ ++DEFINE_GUID(IID_IKsPropertySet, 0x31efac30, 0x515c, 0x11d0, 0xa9, 0xaa, 0x00, 0xaa, 0x00, 0x61, 0xbe, 0x93); ++ ++#undef INTERFACE ++#define INTERFACE IKsPropertySet ++ ++DECLARE_INTERFACE_(IKsPropertySet, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IKsPropertySet methods ++ STDMETHOD(Get) (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength, ++ LPVOID pPropertyData, ULONG ulDataLength, PULONG pulBytesReturned) PURE; ++ STDMETHOD(Set) (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength, ++ LPVOID pPropertyData, ULONG ulDataLength) PURE; ++ STDMETHOD(QuerySupport) (THIS_ REFGUID rguidPropSet, ULONG ulId, PULONG pulTypeSupport) PURE; ++}; ++ ++#define IKsPropertySet_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IKsPropertySet_AddRef(p) IUnknown_AddRef(p) ++#define IKsPropertySet_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->lpVtbl->Get(p,a,b,c,d,e,f,g) ++#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->lpVtbl->Set(p,a,b,c,d,e,f) ++#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->lpVtbl->QuerySupport(p,a,b,c) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->Get(a,b,c,d,e,f,g) ++#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->Set(a,b,c,d,e,f) ++#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->QuerySupport(a,b,c) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // _IKsPropertySet_ ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// IDirectSoundFXGargle ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352, 0xd622, 0x11ce, 0xaa, 0xc5, 0x00, 0x20, 0xaf, 0x0b, 0x99, 0xa3); ++ ++typedef struct _DSFXGargle ++{ ++ DWORD dwRateHz; // Rate of modulation in hz ++ DWORD dwWaveShape; // DSFXGARGLE_WAVE_xxx ++} DSFXGargle, *LPDSFXGargle; ++ ++#define DSFXGARGLE_WAVE_TRIANGLE 0 ++#define DSFXGARGLE_WAVE_SQUARE 1 ++ ++typedef const DSFXGargle *LPCDSFXGargle; ++ ++#define DSFXGARGLE_RATEHZ_MIN 1 ++#define DSFXGARGLE_RATEHZ_MAX 1000 ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXGargle ++ ++DECLARE_INTERFACE_(IDirectSoundFXGargle, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXGargle methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXGargle pcDsFxGargle) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXGargle pDsFxGargle) PURE; ++}; ++ ++#define IDirectSoundFXGargle_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXGargle_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXGargle_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXGargle_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXGargle_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXChorus ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3, 0x145f, 0x43e6, 0xa9, 0x34, 0xa7, 0x18, 0x06, 0xe5, 0x05, 0x47); ++ ++typedef struct _DSFXChorus ++{ ++ FLOAT fWetDryMix; ++ FLOAT fDepth; ++ FLOAT fFeedback; ++ FLOAT fFrequency; ++ LONG lWaveform; // LFO shape; DSFXCHORUS_WAVE_xxx ++ FLOAT fDelay; ++ LONG lPhase; ++} DSFXChorus, *LPDSFXChorus; ++ ++typedef const DSFXChorus *LPCDSFXChorus; ++ ++#define DSFXCHORUS_WAVE_TRIANGLE 0 ++#define DSFXCHORUS_WAVE_SIN 1 ++ ++#define DSFXCHORUS_WETDRYMIX_MIN 0.0f ++#define DSFXCHORUS_WETDRYMIX_MAX 100.0f ++#define DSFXCHORUS_DEPTH_MIN 0.0f ++#define DSFXCHORUS_DEPTH_MAX 100.0f ++#define DSFXCHORUS_FEEDBACK_MIN -99.0f ++#define DSFXCHORUS_FEEDBACK_MAX 99.0f ++#define DSFXCHORUS_FREQUENCY_MIN 0.0f ++#define DSFXCHORUS_FREQUENCY_MAX 10.0f ++#define DSFXCHORUS_DELAY_MIN 0.0f ++#define DSFXCHORUS_DELAY_MAX 20.0f ++#define DSFXCHORUS_PHASE_MIN 0 ++#define DSFXCHORUS_PHASE_MAX 4 ++ ++#define DSFXCHORUS_PHASE_NEG_180 0 ++#define DSFXCHORUS_PHASE_NEG_90 1 ++#define DSFXCHORUS_PHASE_ZERO 2 ++#define DSFXCHORUS_PHASE_90 3 ++#define DSFXCHORUS_PHASE_180 4 ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXChorus ++ ++DECLARE_INTERFACE_(IDirectSoundFXChorus, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXChorus methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXChorus pcDsFxChorus) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXChorus pDsFxChorus) PURE; ++}; ++ ++#define IDirectSoundFXChorus_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXChorus_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXChorus_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXChorus_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXChorus_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXFlanger ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878, 0x2c92, 0x4072, 0x9b, 0x2c, 0xea, 0x68, 0xf5, 0x39, 0x67, 0x83); ++ ++typedef struct _DSFXFlanger ++{ ++ FLOAT fWetDryMix; ++ FLOAT fDepth; ++ FLOAT fFeedback; ++ FLOAT fFrequency; ++ LONG lWaveform; ++ FLOAT fDelay; ++ LONG lPhase; ++} DSFXFlanger, *LPDSFXFlanger; ++ ++typedef const DSFXFlanger *LPCDSFXFlanger; ++ ++#define DSFXFLANGER_WAVE_TRIANGLE 0 ++#define DSFXFLANGER_WAVE_SIN 1 ++ ++#define DSFXFLANGER_WETDRYMIX_MIN 0.0f ++#define DSFXFLANGER_WETDRYMIX_MAX 100.0f ++#define DSFXFLANGER_FREQUENCY_MIN 0.0f ++#define DSFXFLANGER_FREQUENCY_MAX 10.0f ++#define DSFXFLANGER_DEPTH_MIN 0.0f ++#define DSFXFLANGER_DEPTH_MAX 100.0f ++#define DSFXFLANGER_PHASE_MIN 0 ++#define DSFXFLANGER_PHASE_MAX 4 ++#define DSFXFLANGER_FEEDBACK_MIN -99.0f ++#define DSFXFLANGER_FEEDBACK_MAX 99.0f ++#define DSFXFLANGER_DELAY_MIN 0.0f ++#define DSFXFLANGER_DELAY_MAX 4.0f ++ ++#define DSFXFLANGER_PHASE_NEG_180 0 ++#define DSFXFLANGER_PHASE_NEG_90 1 ++#define DSFXFLANGER_PHASE_ZERO 2 ++#define DSFXFLANGER_PHASE_90 3 ++#define DSFXFLANGER_PHASE_180 4 ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXFlanger ++ ++DECLARE_INTERFACE_(IDirectSoundFXFlanger, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXFlanger methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXFlanger pcDsFxFlanger) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXFlanger pDsFxFlanger) PURE; ++}; ++ ++#define IDirectSoundFXFlanger_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXFlanger_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXFlanger_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXFlanger_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXFlanger_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXEcho ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf, 0x50db, 0x4e92, 0xa2, 0xbd, 0x44, 0x54, 0x88, 0xd1, 0xed, 0x42); ++ ++typedef struct _DSFXEcho ++{ ++ FLOAT fWetDryMix; ++ FLOAT fFeedback; ++ FLOAT fLeftDelay; ++ FLOAT fRightDelay; ++ LONG lPanDelay; ++} DSFXEcho, *LPDSFXEcho; ++ ++typedef const DSFXEcho *LPCDSFXEcho; ++ ++#define DSFXECHO_WETDRYMIX_MIN 0.0f ++#define DSFXECHO_WETDRYMIX_MAX 100.0f ++#define DSFXECHO_FEEDBACK_MIN 0.0f ++#define DSFXECHO_FEEDBACK_MAX 100.0f ++#define DSFXECHO_LEFTDELAY_MIN 1.0f ++#define DSFXECHO_LEFTDELAY_MAX 2000.0f ++#define DSFXECHO_RIGHTDELAY_MIN 1.0f ++#define DSFXECHO_RIGHTDELAY_MAX 2000.0f ++#define DSFXECHO_PANDELAY_MIN 0 ++#define DSFXECHO_PANDELAY_MAX 1 ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXEcho ++ ++DECLARE_INTERFACE_(IDirectSoundFXEcho, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXEcho methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXEcho pcDsFxEcho) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXEcho pDsFxEcho) PURE; ++}; ++ ++#define IDirectSoundFXEcho_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXEcho_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXEcho_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXEcho_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXEcho_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXDistortion ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326, 0x455f, 0x4d8b, 0xbd, 0xa9, 0x8d, 0x5d, 0x3e, 0x9e, 0x3e, 0x0b); ++ ++typedef struct _DSFXDistortion ++{ ++ FLOAT fGain; ++ FLOAT fEdge; ++ FLOAT fPostEQCenterFrequency; ++ FLOAT fPostEQBandwidth; ++ FLOAT fPreLowpassCutoff; ++} DSFXDistortion, *LPDSFXDistortion; ++ ++typedef const DSFXDistortion *LPCDSFXDistortion; ++ ++#define DSFXDISTORTION_GAIN_MIN -60.0f ++#define DSFXDISTORTION_GAIN_MAX 0.0f ++#define DSFXDISTORTION_EDGE_MIN 0.0f ++#define DSFXDISTORTION_EDGE_MAX 100.0f ++#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MIN 100.0f ++#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MAX 8000.0f ++#define DSFXDISTORTION_POSTEQBANDWIDTH_MIN 100.0f ++#define DSFXDISTORTION_POSTEQBANDWIDTH_MAX 8000.0f ++#define DSFXDISTORTION_PRELOWPASSCUTOFF_MIN 100.0f ++#define DSFXDISTORTION_PRELOWPASSCUTOFF_MAX 8000.0f ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXDistortion ++ ++DECLARE_INTERFACE_(IDirectSoundFXDistortion, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXDistortion methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXDistortion pcDsFxDistortion) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXDistortion pDsFxDistortion) PURE; ++}; ++ ++#define IDirectSoundFXDistortion_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXDistortion_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXDistortion_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXDistortion_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXDistortion_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXCompressor ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154, 0x62f6, 0x4e2c, 0xa1, 0x5c, 0xd3, 0xb6, 0xc4, 0x17, 0xf7, 0xa0); ++ ++typedef struct _DSFXCompressor ++{ ++ FLOAT fGain; ++ FLOAT fAttack; ++ FLOAT fRelease; ++ FLOAT fThreshold; ++ FLOAT fRatio; ++ FLOAT fPredelay; ++} DSFXCompressor, *LPDSFXCompressor; ++ ++typedef const DSFXCompressor *LPCDSFXCompressor; ++ ++#define DSFXCOMPRESSOR_GAIN_MIN -60.0f ++#define DSFXCOMPRESSOR_GAIN_MAX 60.0f ++#define DSFXCOMPRESSOR_ATTACK_MIN 0.01f ++#define DSFXCOMPRESSOR_ATTACK_MAX 500.0f ++#define DSFXCOMPRESSOR_RELEASE_MIN 50.0f ++#define DSFXCOMPRESSOR_RELEASE_MAX 3000.0f ++#define DSFXCOMPRESSOR_THRESHOLD_MIN -60.0f ++#define DSFXCOMPRESSOR_THRESHOLD_MAX 0.0f ++#define DSFXCOMPRESSOR_RATIO_MIN 1.0f ++#define DSFXCOMPRESSOR_RATIO_MAX 100.0f ++#define DSFXCOMPRESSOR_PREDELAY_MIN 0.0f ++#define DSFXCOMPRESSOR_PREDELAY_MAX 4.0f ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXCompressor ++ ++DECLARE_INTERFACE_(IDirectSoundFXCompressor, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXCompressor methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXCompressor pcDsFxCompressor) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXCompressor pDsFxCompressor) PURE; ++}; ++ ++#define IDirectSoundFXCompressor_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXCompressor_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXCompressor_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXCompressor_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXCompressor_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundFXParamEq ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe, 0xfe90, 0x4204, 0x80, 0x78, 0x82, 0x33, 0x4c, 0xd1, 0x77, 0xda); ++ ++typedef struct _DSFXParamEq ++{ ++ FLOAT fCenter; ++ FLOAT fBandwidth; ++ FLOAT fGain; ++} DSFXParamEq, *LPDSFXParamEq; ++ ++typedef const DSFXParamEq *LPCDSFXParamEq; ++ ++#define DSFXPARAMEQ_CENTER_MIN 80.0f ++#define DSFXPARAMEQ_CENTER_MAX 16000.0f ++#define DSFXPARAMEQ_BANDWIDTH_MIN 1.0f ++#define DSFXPARAMEQ_BANDWIDTH_MAX 36.0f ++#define DSFXPARAMEQ_GAIN_MIN -15.0f ++#define DSFXPARAMEQ_GAIN_MAX 15.0f ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXParamEq ++ ++DECLARE_INTERFACE_(IDirectSoundFXParamEq, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXParamEq methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXParamEq pcDsFxParamEq) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXParamEq pDsFxParamEq) PURE; ++}; ++ ++#define IDirectSoundFXParamEq_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXParamEq_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXParamEq_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXParamEq_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXParamEq_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++ ++// ++// IDirectSoundFXI3DL2Reverb ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4); ++ ++typedef struct _DSFXI3DL2Reverb ++{ ++ LONG lRoom; // [-10000, 0] default: -1000 mB ++ LONG lRoomHF; // [-10000, 0] default: 0 mB ++ FLOAT flRoomRolloffFactor; // [0.0, 10.0] default: 0.0 ++ FLOAT flDecayTime; // [0.1, 20.0] default: 1.49s ++ FLOAT flDecayHFRatio; // [0.1, 2.0] default: 0.83 ++ LONG lReflections; // [-10000, 1000] default: -2602 mB ++ FLOAT flReflectionsDelay; // [0.0, 0.3] default: 0.007 s ++ LONG lReverb; // [-10000, 2000] default: 200 mB ++ FLOAT flReverbDelay; // [0.0, 0.1] default: 0.011 s ++ FLOAT flDiffusion; // [0.0, 100.0] default: 100.0 % ++ FLOAT flDensity; // [0.0, 100.0] default: 100.0 % ++ FLOAT flHFReference; // [20.0, 20000.0] default: 5000.0 Hz ++} DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; ++ ++typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; ++ ++#define DSFX_I3DL2REVERB_ROOM_MIN (-10000) ++#define DSFX_I3DL2REVERB_ROOM_MAX 0 ++#define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) ++ ++#define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) ++#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 ++#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT (-100) ++ ++#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f ++#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f ++#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f ++ ++#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f ++#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f ++#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f ++ ++#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f ++#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f ++#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f ++ ++#define DSFX_I3DL2REVERB_REFLECTIONS_MIN (-10000) ++#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 ++#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT (-2602) ++ ++#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f ++#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f ++#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f ++ ++#define DSFX_I3DL2REVERB_REVERB_MIN (-10000) ++#define DSFX_I3DL2REVERB_REVERB_MAX 2000 ++#define DSFX_I3DL2REVERB_REVERB_DEFAULT (200) ++ ++#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f ++#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f ++#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f ++ ++#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f ++#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f ++#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f ++ ++#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f ++#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f ++#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f ++ ++#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f ++#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f ++#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f ++ ++#define DSFX_I3DL2REVERB_QUALITY_MIN 0 ++#define DSFX_I3DL2REVERB_QUALITY_MAX 3 ++#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXI3DL2Reverb ++ ++DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXI3DL2Reverb methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXI3DL2Reverb pcDsFxI3DL2Reverb) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXI3DL2Reverb pDsFxI3DL2Reverb) PURE; ++ STDMETHOD(SetPreset) (THIS_ DWORD dwPreset) PURE; ++ STDMETHOD(GetPreset) (THIS_ LPDWORD pdwPreset) PURE; ++ STDMETHOD(SetQuality) (THIS_ LONG lQuality) PURE; ++ STDMETHOD(GetQuality) (THIS_ LONG *plQuality) PURE; ++}; ++ ++#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXI3DL2Reverb_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXI3DL2Reverb_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->lpVtbl->SetPreset(p,a) ++#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->lpVtbl->GetPreset(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->SetPreset(a) ++#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->GetPreset(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++ ++// ++// IDirectSoundFXWavesReverb ++// ++ ++DEFINE_GUID(IID_IDirectSoundFXWavesReverb,0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25); ++ ++typedef struct _DSFXWavesReverb ++{ ++ FLOAT fInGain; // [-96.0,0.0] default: 0.0 dB ++ FLOAT fReverbMix; // [-96.0,0.0] default: 0.0 db ++ FLOAT fReverbTime; // [0.001,3000.0] default: 1000.0 ms ++ FLOAT fHighFreqRTRatio; // [0.001,0.999] default: 0.001 ++} DSFXWavesReverb, *LPDSFXWavesReverb; ++ ++typedef const DSFXWavesReverb *LPCDSFXWavesReverb; ++ ++#define DSFX_WAVESREVERB_INGAIN_MIN -96.0f ++#define DSFX_WAVESREVERB_INGAIN_MAX 0.0f ++#define DSFX_WAVESREVERB_INGAIN_DEFAULT 0.0f ++#define DSFX_WAVESREVERB_REVERBMIX_MIN -96.0f ++#define DSFX_WAVESREVERB_REVERBMIX_MAX 0.0f ++#define DSFX_WAVESREVERB_REVERBMIX_DEFAULT 0.0f ++#define DSFX_WAVESREVERB_REVERBTIME_MIN 0.001f ++#define DSFX_WAVESREVERB_REVERBTIME_MAX 3000.0f ++#define DSFX_WAVESREVERB_REVERBTIME_DEFAULT 1000.0f ++#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MIN 0.001f ++#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MAX 0.999f ++#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_DEFAULT 0.001f ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFXWavesReverb ++ ++DECLARE_INTERFACE_(IDirectSoundFXWavesReverb, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFXWavesReverb methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSFXWavesReverb pcDsFxWavesReverb) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSFXWavesReverb pDsFxWavesReverb) PURE; ++}; ++ ++#define IDirectSoundFXWavesReverb_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFXWavesReverb_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFXWavesReverb_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFXWavesReverb_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++// ++// IDirectSoundCaptureFXAec ++// ++ ++DEFINE_GUID(IID_IDirectSoundCaptureFXAec, 0x174d3eb9, 0x6696, 0x4fac, 0xa4, 0x6c, 0xa0, 0xac, 0x7b, 0xc9, 0xe2, 0xf); ++ ++typedef struct _DSCFXAec ++{ ++ BOOL fEnable; ++ BOOL fReset; ++} DSCFXAec, *LPDSCFXAec; ++ ++typedef const DSCFXAec *LPCDSCFXAec; ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundCaptureFXAec ++ ++DECLARE_INTERFACE_(IDirectSoundCaptureFXAec, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundCaptureFXAec methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSCFXAec pDscFxAec) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSCFXAec pDscFxAec) PURE; ++}; ++ ++#define IDirectSoundCaptureFXAec_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundCaptureFXAec_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundCaptureFXAec_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureFXAec_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundCaptureFXAec_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureFXAec_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundCaptureFXAec_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++ ++// ++// IDirectSoundCaptureFXNoiseSuppress ++// ++ ++DEFINE_GUID(IID_IDirectSoundCaptureFXNoiseSuppress, 0xed311e41, 0xfbae, 0x4175, 0x96, 0x25, 0xcd, 0x8, 0x54, 0xf6, 0x93, 0xca); ++ ++typedef struct _DSCFXNoiseSuppress ++{ ++ BOOL fEnable; ++ BOOL fReset; ++} DSCFXNoiseSuppress, *LPDSCFXNoiseSuppress; ++ ++typedef const DSCFXNoiseSuppress *LPCDSCFXNoiseSuppress; ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundCaptureFXNoiseSuppress ++ ++DECLARE_INTERFACE_(IDirectSoundCaptureFXNoiseSuppress, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundCaptureFXNoiseSuppress methods ++ STDMETHOD(SetAllParameters) (THIS_ LPCDSCFXNoiseSuppress pcDscFxNoiseSuppress) PURE; ++ STDMETHOD(GetAllParameters) (THIS_ LPDSCFXNoiseSuppress pDscFxNoiseSuppress) PURE; ++}; ++ ++#define IDirectSoundCaptureFXNoiseSuppress_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundCaptureFXNoiseSuppress_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundCaptureFXNoiseSuppress_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) ++#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a) (p)->SetAllParameters(a) ++#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a) (p)->GetAllParameters(a) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++ ++// ++// IDirectSoundFullDuplex ++// ++ ++#ifndef _IDirectSoundFullDuplex_ ++#define _IDirectSoundFullDuplex_ ++ ++#ifdef __cplusplus ++// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined ++struct IDirectSoundFullDuplex; ++#endif // __cplusplus ++ ++typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX; ++ ++DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xedcb4c7a, 0xdaab, 0x4216, 0xa4, 0x2e, 0x6c, 0x50, 0x59, 0x6d, 0xdc, 0x1d); ++ ++#undef INTERFACE ++#define INTERFACE IDirectSoundFullDuplex ++ ++DECLARE_INTERFACE_(IDirectSoundFullDuplex, IUnknown) ++{ ++ // IUnknown methods ++ STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE; ++ STDMETHOD_(ULONG,AddRef) (THIS) PURE; ++ STDMETHOD_(ULONG,Release) (THIS) PURE; ++ ++ // IDirectSoundFullDuplex methods ++ STDMETHOD(Initialize) (THIS_ LPCGUID pCaptureGuid, LPCGUID pRenderGuid, LPCDSCBUFFERDESC lpDscBufferDesc, LPCDSBUFFERDESC lpDsBufferDesc, HWND hWnd, DWORD dwLevel, LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8, LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8) PURE; ++}; ++ ++#define IDirectSoundFullDuplex_QueryInterface(p,a,b) IUnknown_QueryInterface(p,a,b) ++#define IDirectSoundFullDuplex_AddRef(p) IUnknown_AddRef(p) ++#define IDirectSoundFullDuplex_Release(p) IUnknown_Release(p) ++ ++#if !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Initialize(p,a,b,c,d,e,f,g,h) ++#else // !defined(__cplusplus) || defined(CINTERFACE) ++#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->Initialize(a,b,c,d,e,f,g,h) ++#endif // !defined(__cplusplus) || defined(CINTERFACE) ++ ++#endif // _IDirectSoundFullDuplex_ ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// Return Codes ++// ++ ++// The function completed successfully ++#define DS_OK S_OK ++ ++// The call succeeded, but we had to substitute the 3D algorithm ++#define DS_NO_VIRTUALIZATION MAKE_HRESULT(0, _FACDS, 10) ++ ++// The call succeeded, but not all of the optional effects were obtained. ++#define DS_INCOMPLETE MAKE_HRESULT(0, _FACDS, 20) ++ ++// The call failed because resources (such as a priority level) ++// were already being used by another caller ++#define DSERR_ALLOCATED MAKE_DSHRESULT(10) ++ ++// The control (vol, pan, etc.) requested by the caller is not available ++#define DSERR_CONTROLUNAVAIL MAKE_DSHRESULT(30) ++ ++// An invalid parameter was passed to the returning function ++#define DSERR_INVALIDPARAM E_INVALIDARG ++ ++// This call is not valid for the current state of this object ++#define DSERR_INVALIDCALL MAKE_DSHRESULT(50) ++ ++// An undetermined error occurred inside the DirectSound subsystem ++#define DSERR_GENERIC E_FAIL ++ ++// The caller does not have the priority level required for the function to ++// succeed ++#define DSERR_PRIOLEVELNEEDED MAKE_DSHRESULT(70) ++ ++// Not enough free memory is available to complete the operation ++#define DSERR_OUTOFMEMORY E_OUTOFMEMORY ++ ++// The specified WAVE format is not supported ++#define DSERR_BADFORMAT MAKE_DSHRESULT(100) ++ ++// The function called is not supported at this time ++#define DSERR_UNSUPPORTED E_NOTIMPL ++ ++// No sound driver is available for use ++#define DSERR_NODRIVER MAKE_DSHRESULT(120) ++ ++// This object is already initialized ++#define DSERR_ALREADYINITIALIZED MAKE_DSHRESULT(130) ++ ++// This object does not support aggregation ++#define DSERR_NOAGGREGATION CLASS_E_NOAGGREGATION ++ ++// The buffer memory has been lost, and must be restored ++#define DSERR_BUFFERLOST MAKE_DSHRESULT(150) ++ ++// Another app has a higher priority level, preventing this call from ++// succeeding ++#define DSERR_OTHERAPPHASPRIO MAKE_DSHRESULT(160) ++ ++// This object has not been initialized ++#define DSERR_UNINITIALIZED MAKE_DSHRESULT(170) ++ ++// The requested COM interface is not available ++#define DSERR_NOINTERFACE E_NOINTERFACE ++ ++// Access is denied ++#define DSERR_ACCESSDENIED E_ACCESSDENIED ++ ++// Tried to create a DSBCAPS_CTRLFX buffer shorter than DSBSIZE_FX_MIN milliseconds ++#define DSERR_BUFFERTOOSMALL MAKE_DSHRESULT(180) ++ ++// Attempt to use DirectSound 8 functionality on an older DirectSound object ++#define DSERR_DS8_REQUIRED MAKE_DSHRESULT(190) ++ ++// A circular loop of send effects was detected ++#define DSERR_SENDLOOP MAKE_DSHRESULT(200) ++ ++// The GUID specified in an audiopath file does not match a valid MIXIN buffer ++#define DSERR_BADSENDBUFFERGUID MAKE_DSHRESULT(210) ++ ++// The object requested was not found (numerically equal to DMUS_E_NOT_FOUND) ++#define DSERR_OBJECTNOTFOUND MAKE_DSHRESULT(4449) ++ ++// ++// Flags ++// ++ ++#define DSCAPS_PRIMARYMONO 0x00000001 ++#define DSCAPS_PRIMARYSTEREO 0x00000002 ++#define DSCAPS_PRIMARY8BIT 0x00000004 ++#define DSCAPS_PRIMARY16BIT 0x00000008 ++#define DSCAPS_CONTINUOUSRATE 0x00000010 ++#define DSCAPS_EMULDRIVER 0x00000020 ++#define DSCAPS_CERTIFIED 0x00000040 ++#define DSCAPS_SECONDARYMONO 0x00000100 ++#define DSCAPS_SECONDARYSTEREO 0x00000200 ++#define DSCAPS_SECONDARY8BIT 0x00000400 ++#define DSCAPS_SECONDARY16BIT 0x00000800 ++ ++#define DSSCL_NORMAL 0x00000001 ++#define DSSCL_PRIORITY 0x00000002 ++#define DSSCL_EXCLUSIVE 0x00000003 ++#define DSSCL_WRITEPRIMARY 0x00000004 ++ ++#define DSSPEAKER_HEADPHONE 0x00000001 ++#define DSSPEAKER_MONO 0x00000002 ++#define DSSPEAKER_QUAD 0x00000003 ++#define DSSPEAKER_STEREO 0x00000004 ++#define DSSPEAKER_SURROUND 0x00000005 ++#define DSSPEAKER_5POINT1 0x00000006 ++ ++#define DSSPEAKER_GEOMETRY_MIN 0x00000005 // 5 degrees ++#define DSSPEAKER_GEOMETRY_NARROW 0x0000000A // 10 degrees ++#define DSSPEAKER_GEOMETRY_WIDE 0x00000014 // 20 degrees ++#define DSSPEAKER_GEOMETRY_MAX 0x000000B4 // 180 degrees ++ ++#define DSSPEAKER_COMBINED(c, g) ((DWORD)(((BYTE)(c)) | ((DWORD)((BYTE)(g))) << 16)) ++#define DSSPEAKER_CONFIG(a) ((BYTE)(a)) ++#define DSSPEAKER_GEOMETRY(a) ((BYTE)(((DWORD)(a) >> 16) & 0x00FF)) ++ ++#define DSBCAPS_PRIMARYBUFFER 0x00000001 ++#define DSBCAPS_STATIC 0x00000002 ++#define DSBCAPS_LOCHARDWARE 0x00000004 ++#define DSBCAPS_LOCSOFTWARE 0x00000008 ++#define DSBCAPS_CTRL3D 0x00000010 ++#define DSBCAPS_CTRLFREQUENCY 0x00000020 ++#define DSBCAPS_CTRLPAN 0x00000040 ++#define DSBCAPS_CTRLVOLUME 0x00000080 ++#define DSBCAPS_CTRLPOSITIONNOTIFY 0x00000100 ++#define DSBCAPS_CTRLFX 0x00000200 ++#define DSBCAPS_STICKYFOCUS 0x00004000 ++#define DSBCAPS_GLOBALFOCUS 0x00008000 ++#define DSBCAPS_GETCURRENTPOSITION2 0x00010000 ++#define DSBCAPS_MUTE3DATMAXDISTANCE 0x00020000 ++#define DSBCAPS_LOCDEFER 0x00040000 ++ ++#define DSBPLAY_LOOPING 0x00000001 ++#define DSBPLAY_LOCHARDWARE 0x00000002 ++#define DSBPLAY_LOCSOFTWARE 0x00000004 ++#define DSBPLAY_TERMINATEBY_TIME 0x00000008 ++#define DSBPLAY_TERMINATEBY_DISTANCE 0x000000010 ++#define DSBPLAY_TERMINATEBY_PRIORITY 0x000000020 ++ ++#define DSBSTATUS_PLAYING 0x00000001 ++#define DSBSTATUS_BUFFERLOST 0x00000002 ++#define DSBSTATUS_LOOPING 0x00000004 ++#define DSBSTATUS_LOCHARDWARE 0x00000008 ++#define DSBSTATUS_LOCSOFTWARE 0x00000010 ++#define DSBSTATUS_TERMINATED 0x00000020 ++ ++#define DSBLOCK_FROMWRITECURSOR 0x00000001 ++#define DSBLOCK_ENTIREBUFFER 0x00000002 ++ ++#define DSBFREQUENCY_MIN 100 ++#define DSBFREQUENCY_MAX 100000 ++#define DSBFREQUENCY_ORIGINAL 0 ++ ++#define DSBPAN_LEFT -10000 ++#define DSBPAN_CENTER 0 ++#define DSBPAN_RIGHT 10000 ++ ++#define DSBVOLUME_MIN -10000 ++#define DSBVOLUME_MAX 0 ++ ++#define DSBSIZE_MIN 4 ++#define DSBSIZE_MAX 0x0FFFFFFF ++#define DSBSIZE_FX_MIN 150 // NOTE: Milliseconds, not bytes ++ ++#define DS3DMODE_NORMAL 0x00000000 ++#define DS3DMODE_HEADRELATIVE 0x00000001 ++#define DS3DMODE_DISABLE 0x00000002 ++ ++#define DS3D_IMMEDIATE 0x00000000 ++#define DS3D_DEFERRED 0x00000001 ++ ++#define DS3D_MINDISTANCEFACTOR FLT_MIN ++#define DS3D_MAXDISTANCEFACTOR FLT_MAX ++#define DS3D_DEFAULTDISTANCEFACTOR 1.0f ++ ++#define DS3D_MINROLLOFFFACTOR 0.0f ++#define DS3D_MAXROLLOFFFACTOR 10.0f ++#define DS3D_DEFAULTROLLOFFFACTOR 1.0f ++ ++#define DS3D_MINDOPPLERFACTOR 0.0f ++#define DS3D_MAXDOPPLERFACTOR 10.0f ++#define DS3D_DEFAULTDOPPLERFACTOR 1.0f ++ ++#define DS3D_DEFAULTMINDISTANCE 1.0f ++#define DS3D_DEFAULTMAXDISTANCE 1000000000.0f ++ ++#define DS3D_MINCONEANGLE 0 ++#define DS3D_MAXCONEANGLE 360 ++#define DS3D_DEFAULTCONEANGLE 360 ++ ++#define DS3D_DEFAULTCONEOUTSIDEVOLUME DSBVOLUME_MAX ++ ++// IDirectSoundCapture attributes ++ ++#define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER ++#define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED ++ ++// IDirectSoundCaptureBuffer attributes ++ ++#define DSCBCAPS_WAVEMAPPED 0x80000000 ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++#define DSCBCAPS_CTRLFX 0x00000200 ++#endif ++ ++ ++#define DSCBLOCK_ENTIREBUFFER 0x00000001 ++ ++#define DSCBSTATUS_CAPTURING 0x00000001 ++#define DSCBSTATUS_LOOPING 0x00000002 ++ ++#define DSCBSTART_LOOPING 0x00000001 ++ ++#define DSBPN_OFFSETSTOP 0xFFFFFFFF ++ ++#define DS_CERTIFIED 0x00000000 ++#define DS_UNCERTIFIED 0x00000001 ++ ++// Dsound SYSTEM resource constants ++// Matches the KSAUDIO_CPU_RESOURCES_xxx_HOST_CPU values defined ++// in ksmedia.h. ++#define DS_SYSTEM_RESOURCES_NO_HOST_RESOURCES 0x00000000 ++#define DS_SYSTEM_RESOURCES_ALL_HOST_RESOURCES 0x7FFFFFFF ++#define DS_SYSTEM_RESOURCES_UNDEFINED 0x80000000 ++ ++ ++// ++// I3DL2 Material Presets ++// ++ ++enum ++{ ++ DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW, ++ DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW, ++ DSFX_I3DL2_MATERIAL_PRESET_THINDOOR, ++ DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR, ++ DSFX_I3DL2_MATERIAL_PRESET_WOODWALL, ++ DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL, ++ DSFX_I3DL2_MATERIAL_PRESET_STONEWALL, ++ DSFX_I3DL2_MATERIAL_PRESET_CURTAIN ++}; ++ ++#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW -2800,0.71f ++#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW -5000,0.40f ++#define I3DL2_MATERIAL_PRESET_THINDOOR -1800,0.66f ++#define I3DL2_MATERIAL_PRESET_THICKDOOR -4400,0.64f ++#define I3DL2_MATERIAL_PRESET_WOODWALL -4000,0.50f ++#define I3DL2_MATERIAL_PRESET_BRICKWALL -5000,0.60f ++#define I3DL2_MATERIAL_PRESET_STONEWALL -6000,0.68f ++#define I3DL2_MATERIAL_PRESET_CURTAIN -1200,0.15f ++ ++ ++enum ++{ ++ DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_CITY, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL, ++ DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE ++}; ++ ++// ++// I3DL2 Reverberation Presets Values ++// ++ ++#define I3DL2_ENVIRONMENT_PRESET_DEFAULT -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f, 200, 0.011f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_GENERIC -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f, 200, 0.011f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL -1000,-6000, 0.0f, 0.17f, 0.10f, -1204, 0.001f, 207, 0.002f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_ROOM -1000, -454, 0.0f, 0.40f, 0.83f, -1646, 0.002f, 53, 0.003f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_BATHROOM -1000,-1200, 0.0f, 1.49f, 0.54f, -370, 0.007f, 1030, 0.011f, 100.0f, 60.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM -1000,-6000, 0.0f, 0.50f, 0.10f, -1376, 0.003f, -1104, 0.004f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_STONEROOM -1000, -300, 0.0f, 2.31f, 0.64f, -711, 0.012f, 83, 0.017f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM -1000, -476, 0.0f, 4.32f, 0.59f, -789, 0.020f, -289, 0.030f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL -1000, -500, 0.0f, 3.92f, 0.70f, -1230, 0.020f, -2, 0.029f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_CAVE -1000, 0, 0.0f, 2.91f, 1.30f, -602, 0.015f, -302, 0.022f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_ARENA -1000, -698, 0.0f, 7.24f, 0.33f, -1166, 0.020f, 16, 0.030f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_HANGAR -1000,-1000, 0.0f,10.05f, 0.23f, -602, 0.020f, 198, 0.030f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000, 0.0f, 0.30f, 0.10f, -1831, 0.002f, -1630, 0.030f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_HALLWAY -1000, -300, 0.0f, 1.49f, 0.59f, -1219, 0.007f, 441, 0.011f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR -1000, -237, 0.0f, 2.70f, 0.79f, -1214, 0.013f, 395, 0.020f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_ALLEY -1000, -270, 0.0f, 1.49f, 0.86f, -1204, 0.007f, -4, 0.011f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_FOREST -1000,-3300, 0.0f, 1.49f, 0.54f, -2560, 0.162f, -613, 0.088f, 79.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_CITY -1000, -800, 0.0f, 1.49f, 0.67f, -2273, 0.007f, -2217, 0.011f, 50.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS -1000,-2500, 0.0f, 1.49f, 0.21f, -2780, 0.300f, -2014, 0.100f, 27.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_QUARRY -1000,-1000, 0.0f, 1.49f, 0.83f,-10000, 0.061f, 500, 0.025f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_PLAIN -1000,-2000, 0.0f, 1.49f, 0.50f, -2466, 0.179f, -2514, 0.100f, 21.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT -1000, 0, 0.0f, 1.65f, 1.50f, -1363, 0.008f, -1153, 0.012f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE -1000,-1000, 0.0f, 2.81f, 0.14f, 429, 0.014f, 648, 0.021f, 80.0f, 60.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER -1000,-4000, 0.0f, 1.49f, 0.10f, -449, 0.007f, 1700, 0.011f, 100.0f, 100.0f, 5000.0f ++ ++// ++// Examples simulating 'musical' reverb presets ++// ++// Name Decay time Description ++// Small Room 1.1s A small size room with a length of 5m or so. ++// Medium Room 1.3s A medium size room with a length of 10m or so. ++// Large Room 1.5s A large size room suitable for live performances. ++// Medium Hall 1.8s A medium size concert hall. ++// Large Hall 1.8s A large size concert hall suitable for a full orchestra. ++// Plate 1.3s A plate reverb simulation. ++// ++ ++#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM -1000, -600, 0.0f, 1.10f, 0.83f, -400, 0.005f, 500, 0.010f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM -1000, -600, 0.0f, 1.30f, 0.83f, -1000, 0.010f, -200, 0.020f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM -1000, -600, 0.0f, 1.50f, 0.83f, -1600, 0.020f, -1000, 0.040f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL -1000, -600, 0.0f, 1.80f, 0.70f, -1300, 0.015f, -800, 0.030f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL -1000, -600, 0.0f, 1.80f, 0.70f, -2000, 0.030f, -1400, 0.060f, 100.0f, 100.0f, 5000.0f ++#define I3DL2_ENVIRONMENT_PRESET_PLATE -1000, -200, 0.0f, 1.30f, 0.90f, 0, 0.002f, 0, 0.010f, 100.0f, 75.0f, 5000.0f ++ ++// ++// DirectSound3D Algorithms ++// ++ ++// Default DirectSound3D algorithm {00000000-0000-0000-0000-000000000000} ++#define DS3DALG_DEFAULT GUID_NULL ++ ++// No virtualization (Pan3D) {C241333F-1C1B-11d2-94F5-00C04FC28ACA} ++DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca); ++ ++// High-quality HRTF algorithm {C2413340-1C1B-11d2-94F5-00C04FC28ACA} ++DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca); ++ ++// Lower-quality HRTF algorithm {C2413342-1C1B-11d2-94F5-00C04FC28ACA} ++DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca); ++ ++ ++#if DIRECTSOUND_VERSION >= 0x0800 ++ ++// ++// DirectSound Internal Effect Algorithms ++// ++ ++ ++// Gargle {DAFD8210-5711-4B91-9FE3-F75B7AE279BF} ++DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xdafd8210, 0x5711, 0x4b91, 0x9f, 0xe3, 0xf7, 0x5b, 0x7a, 0xe2, 0x79, 0xbf); ++ ++// Chorus {EFE6629C-81F7-4281-BD91-C9D604A95AF6} ++DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xefe6629c, 0x81f7, 0x4281, 0xbd, 0x91, 0xc9, 0xd6, 0x04, 0xa9, 0x5a, 0xf6); ++ ++// Flanger {EFCA3D92-DFD8-4672-A603-7420894BAD98} ++DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xefca3d92, 0xdfd8, 0x4672, 0xa6, 0x03, 0x74, 0x20, 0x89, 0x4b, 0xad, 0x98); ++ ++// Echo/Delay {EF3E932C-D40B-4F51-8CCF-3F98F1B29D5D} ++DEFINE_GUID(GUID_DSFX_STANDARD_ECHO, 0xef3e932c, 0xd40b, 0x4f51, 0x8c, 0xcf, 0x3f, 0x98, 0xf1, 0xb2, 0x9d, 0x5d); ++ ++// Distortion {EF114C90-CD1D-484E-96E5-09CFAF912A21} ++DEFINE_GUID(GUID_DSFX_STANDARD_DISTORTION, 0xef114c90, 0xcd1d, 0x484e, 0x96, 0xe5, 0x09, 0xcf, 0xaf, 0x91, 0x2a, 0x21); ++ ++// Compressor/Limiter {EF011F79-4000-406D-87AF-BFFB3FC39D57} ++DEFINE_GUID(GUID_DSFX_STANDARD_COMPRESSOR, 0xef011f79, 0x4000, 0x406d, 0x87, 0xaf, 0xbf, 0xfb, 0x3f, 0xc3, 0x9d, 0x57); ++ ++// Parametric Equalization {120CED89-3BF4-4173-A132-3CB406CF3231} ++DEFINE_GUID(GUID_DSFX_STANDARD_PARAMEQ, 0x120ced89, 0x3bf4, 0x4173, 0xa1, 0x32, 0x3c, 0xb4, 0x06, 0xcf, 0x32, 0x31); ++ ++ ++// I3DL2 Environmental Reverberation: Reverb (Listener) Effect {EF985E71-D5C7-42D4-BA4D-2D073E2E96F4} ++DEFINE_GUID(GUID_DSFX_STANDARD_I3DL2REVERB, 0xef985e71, 0xd5c7, 0x42d4, 0xba, 0x4d, 0x2d, 0x07, 0x3e, 0x2e, 0x96, 0xf4); ++ ++// Waves Reverberation {87FC0268-9A55-4360-95AA-004A1D9DE26C} ++DEFINE_GUID(GUID_DSFX_WAVES_REVERB, 0x87fc0268, 0x9a55, 0x4360, 0x95, 0xaa, 0x00, 0x4a, 0x1d, 0x9d, 0xe2, 0x6c); ++ ++// ++// DirectSound Capture Effect Algorithms ++// ++ ++ ++// Acoustic Echo Canceller {BF963D80-C559-11D0-8A2B-00A0C9255AC1} ++// Matches KSNODETYPE_ACOUSTIC_ECHO_CANCEL in ksmedia.h ++DEFINE_GUID(GUID_DSCFX_CLASS_AEC, 0xBF963D80L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); ++ ++// Microsoft AEC {CDEBB919-379A-488a-8765-F53CFD36DE40} ++DEFINE_GUID(GUID_DSCFX_MS_AEC, 0xcdebb919, 0x379a, 0x488a, 0x87, 0x65, 0xf5, 0x3c, 0xfd, 0x36, 0xde, 0x40); ++ ++// System AEC {1C22C56D-9879-4f5b-A389-27996DDC2810} ++DEFINE_GUID(GUID_DSCFX_SYSTEM_AEC, 0x1c22c56d, 0x9879, 0x4f5b, 0xa3, 0x89, 0x27, 0x99, 0x6d, 0xdc, 0x28, 0x10); ++ ++// Noise Supression {E07F903F-62FD-4e60-8CDD-DEA7236665B5} ++// Matches KSNODETYPE_NOISE_SUPPRESS in post Windows ME DDK's ksmedia.h ++DEFINE_GUID(GUID_DSCFX_CLASS_NS, 0xe07f903f, 0x62fd, 0x4e60, 0x8c, 0xdd, 0xde, 0xa7, 0x23, 0x66, 0x65, 0xb5); ++ ++// Microsoft Noise Suppresion {11C5C73B-66E9-4ba1-A0BA-E814C6EED92D} ++DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11c5c73b, 0x66e9, 0x4ba1, 0xa0, 0xba, 0xe8, 0x14, 0xc6, 0xee, 0xd9, 0x2d); ++ ++// System Noise Suppresion {5AB0882E-7274-4516-877D-4EEE99BA4FD0} ++DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5ab0882e, 0x7274, 0x4516, 0x87, 0x7d, 0x4e, 0xee, 0x99, 0xba, 0x4f, 0xd0); ++ ++ ++#endif // DIRECTSOUND_VERSION >= 0x0800 ++ ++#endif // __DSOUND_INCLUDED__ ++ ++ ++ ++#ifdef __cplusplus ++}; ++#endif // __cplusplus ++ ++
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/w32api-2-directx-additions-for-qt.patch Tue Apr 13 03:33:28 2010 +0200 @@ -0,0 +1,1297 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch contains some DirectX additions for MinGW's w32api +which were provided by the Qt project. It was generated via +the following commands: + +#--------------------------------------------------------------------# +wget -c 'http://kent.dl.sourceforge.net/project/mingw/MinGW API for MS-Windows/w32api-3.13/w32api-3.13-mingw32-dev.tar.gz' +wget -c 'http://download.qt.nokia.com/misc/MinGW-gcc440_1.zip' +mkdir a +(cd a; tar -xf ../w32api-3.13-mingw32-dev.tar.gz include) +cp -r a b +unzip -j MinGW-gcc440_1.zip 'mingw/_patches/include.zip' +unzip -aa -p include.zip '*.patch' | patch -d b/include -p1 +(cd b/include; unzip -aa ../../include.zip '*.h') +diff -ruN a b > w32api-2-directx-additions-for-qt.patch +rm -rf a b include.zip +rm -f w32api-3.13-mingw32-dev.tar.gz MinGW-gcc440_1.zip +#--------------------------------------------------------------------# + + +diff -ruN a/include/amvideo.h b/include/amvideo.h +--- a/include/amvideo.h 2008-12-06 03:31:53.000000000 +0100 ++++ b/include/amvideo.h 2010-04-12 17:12:52.000000000 +0200 +@@ -52,10 +52,10 @@ + BITMAPINFOHEADER bmiHeader; + } VIDEOINFOHEADER; + typedef struct tagVIDEOINFO { +- RECT rcSource, +- RECT rcTarget, +- DWORD dwBitRate, +- DWORD dwBitErrorRate, ++ RECT rcSource; ++ RECT rcTarget; ++ DWORD dwBitRate; ++ DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + BITMAPINFOHEADER bmiHeader; + union { +diff -ruN a/include/bdatypes.h b/include/bdatypes.h +--- a/include/bdatypes.h 2008-12-06 03:31:53.000000000 +0100 ++++ b/include/bdatypes.h 2010-04-12 17:12:52.000000000 +0200 +@@ -17,9 +17,9 @@ + } MEDIA_SAMPLE_CONTENT; + /*--- DirectShow Reference - DirectShow Structures */ + typedef struct { +- DWORD dwOffset +- DWORD dwPacketLength +- DWORD dwStride ++ DWORD dwOffset; ++ DWORD dwPacketLength; ++ DWORD dwStride; + } MPEG2_TRANSPORT_STRIDE; + typedef struct { + ULONG ulPID; +diff -ruN a/include/control.h b/include/control.h +--- a/include/control.h 2008-12-06 03:31:54.000000000 +0100 ++++ b/include/control.h 2010-04-12 17:12:52.000000000 +0200 +@@ -11,7 +11,63 @@ + /*--- DirectShow Reference - DirectShow Data Types */ + typedef LONG_PTR OAEVENT; + typedef LONG_PTR OAHWND; ++typedef LONG OAFilterState; + ++DEFINE_GUID(IID_IBasicAudio,0x56a868b3,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); ++DEFINE_GUID(IID_IMediaControl,0x56a868b1,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); ++DEFINE_GUID(IID_IMediaEvent,0x56a868b6,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); ++DEFINE_GUID(IID_IMediaPosition,0x56a868b2,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); ++ ++#define INTERFACE IMediaControl ++DECLARE_INTERFACE_(IMediaControl, IDispatch) ++{ ++ STDMETHOD(Run)(THIS) PURE; ++ STDMETHOD(Pause)(THIS) PURE; ++ STDMETHOD(Stop)(THIS) PURE; ++ STDMETHOD(GetState)(THIS_ LONG, OAFilterState *) PURE; ++ STDMETHOD(RenderFile)(THIS_ BSTR) PURE; ++ STDMETHOD(AddSourceFilter)(THIS_ BSTR, IDispatch **) PURE; ++ STDMETHOD(get_FilterCollection)(THIS_ IDispatch **) PURE; ++ STDMETHOD(get_RegFilterCollection)(IDispatch **) PURE; ++ STDMETHOD(StopWhenReady)(THIS) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IBasicAudio ++DECLARE_INTERFACE_(IBasicAudio, IDispatch) ++{ ++ STDMETHOD(put_Volume)(THIS_ long) PURE; ++ STDMETHOD(get_Volume)(THIS_ long *) PURE; ++ STDMETHOD(put_Balance)(THIS_ long) PURE; ++ STDMETHOD(get_Balance)(THIS_ long *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaPosition ++DECLARE_INTERFACE_(IMediaPosition, IDispatch) ++{ ++ STDMETHOD(get_Duration)(THIS_ REFTIME *) PURE; ++ STDMETHOD(put_CurrentPosition)(THIS_ REFTIME) PURE; ++ STDMETHOD(get_CurrentPosition)(THIS_ REFTIME *) PURE; ++ STDMETHOD(get_StopTime)(THIS_ REFTIME *) PURE; ++ STDMETHOD(put_StopTime)(THIS_ REFTIME) PURE; ++ STDMETHOD(get_PrerollTime)(THIS_ REFTIME *) PURE; ++ STDMETHOD(put_PrerollTime)(THIS_ REFTIME) PURE; ++ STDMETHOD(put_Rate)(THIS_ double) PURE; ++ STDMETHOD(get_Rate)(THIS_ double *) PURE; ++ STDMETHOD(CanSeekForward)(THIS_ LONG *) PURE; ++ STDMETHOD(CanSeekBackward)(THIS_ LONG *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaEvent ++DECLARE_INTERFACE_(IMediaEvent, IDispatch) ++{ ++ STDMETHOD(GetEventHandle)(THIS_ OAEVENT *) PURE; ++ STDMETHOD(GetEvent)(THIS_ long *, LONG_PTR *, LONG_PTR *, long) PURE; ++ STDMETHOD(WaitForCompletion)(THIS_ long,long *) PURE; ++ STDMETHOD(CancelDefaultHandling)(THIS_ long) PURE; ++ STDMETHOD(RestoreDefaultHandling)(THIS_ long) PURE; ++ STDMETHOD(FreeEventParams)(THIS_ long, LONG_PTR, LONG_PTR) PURE; ++}; ++#undef INTERFACE + #ifdef __cplusplus + } + #endif +diff -ruN a/include/ddraw.h b/include/ddraw.h +--- a/include/ddraw.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/ddraw.h 2009-03-09 15:37:42.000000000 +0100 +@@ -0,0 +1,344 @@ ++#ifndef _DDRAW_H ++#define _DDRAW_H ++ ++#if __GNUC__ >= 3 ++#pragma GCC system_header ++#endif ++ ++#include <objbase.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* interfaces */ ++DECLARE_INTERFACE(IDirectDraw); ++DECLARE_INTERFACE(IDirectDrawClipper); ++DECLARE_INTERFACE(IDirectDrawPalette); ++DECLARE_INTERFACE(IDirectDrawSurface); ++typedef IDirectDraw* LPDIRECTDRAW; ++typedef IDirectDrawClipper* LPDIRECTDRAWCLIPPER; ++typedef IDirectDrawPalette* LPDIRECTDRAWPALETTE; ++typedef IDirectDrawSurface* LPDIRECTDRAWSURFACE; ++ ++ ++#define DD_ROP_SPACE (256/32) ++ ++/* struct */ ++typedef struct { ++ DWORD dwColorSpaceLowValue; ++ DWORD dwColorSpaceHighValue; ++} DDCOLORKEY, *LPDDCOLORKEY; ++ ++typedef struct { ++ DWORD dwSize; ++ DWORD dwDDFX; ++ DWORD dwROP; ++ DWORD dwDDROP; ++ DWORD dwRotationAngle; ++ DWORD dwZBufferOpCode; ++ DWORD dwZBufferLow; ++ DWORD dwZBufferHigh; ++ DWORD dwZBufferBaseDest; ++ DWORD dwZDestConstBitDepth; ++ union { ++ DWORD dwZDestConst; ++ LPDIRECTDRAWSURFACE lpDDSZBufferDest; ++ }; ++ DWORD dwZSrcConstBitDepth; ++ union { ++ DWORD dwZSrcConst; ++ LPDIRECTDRAWSURFACE lpDDSZBufferSrc; ++ }; ++ DWORD dwAlphaEdgeBlendBitDepth; ++ DWORD dwAlphaEdgeBlend; ++ DWORD dwReserved; ++ DWORD dwAlphaDestConstBitDepth; ++ union { ++ DWORD dwAlphaDestConst; ++ LPDIRECTDRAWSURFACE lpDDSAlphaDest; ++ }; ++ DWORD dwAlphaSrcConstBitDepth; ++ union { ++ DWORD dwAlphaSrcConst; ++ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; ++ }; ++ union { ++ DWORD dwFillColor; ++ DWORD dwFillDepth; ++ DWORD dwFillPixel; ++ LPDIRECTDRAWSURFACE lpDDSPattern; ++ }; ++ DDCOLORKEY ddckDestColorkey; ++ DDCOLORKEY ddckSrcColorkey; ++} DDBLTFX, *LPDDBLTFX; ++ ++typedef struct { ++ LPRECT lprDest; ++ LPDIRECTDRAWSURFACE lpDDSSrc; ++ LPRECT lprSrc; ++ DWORD dwFlags; ++ LPDDBLTFX lpDDBltFx; ++} DDBLTBATCH, *LPDDBLTBATCH; ++ ++typedef struct { ++ DWORD dwCaps; ++} DDSCAPS, *LPDDSCAPS; ++ ++typedef struct ++{ ++ DWORD dwCaps; ++ DWORD dwCaps2; ++ DWORD dwCaps3; ++ union { ++ DWORD dwCaps4; ++ DWORD dwVolumeDepth; ++ }; ++} DDSCAPS2; ++ ++/*this is the DX7 version (we don't support any previous version)*/ ++typedef struct { ++ DWORD dwSize; ++ DWORD dwCaps; ++ DWORD dwCaps2; ++ DWORD dwCKeyCaps; ++ DWORD dwFXCaps; ++ DWORD dwFXAlphaCaps; ++ DWORD dwPalCaps; ++ DWORD dwSVCaps; ++ DWORD dwAlphaBltConstBitDepths; ++ DWORD dwAlphaBltPixelBitDepths; ++ DWORD dwAlphaBltSurfaceBitDepths; ++ DWORD dwAlphaOverlayConstBitDepths; ++ DWORD dwAlphaOverlayPixelBitDepths; ++ DWORD dwAlphaOverlaySurfaceBitDepths; ++ DWORD dwZBufferBitDepths; ++ DWORD dwVidMemTotal; ++ DWORD dwVidMemFree; ++ DWORD dwMaxVisibleOverlays; ++ DWORD dwCurrVisibleOverlays; ++ DWORD dwNumFourCCCodes; ++ DWORD dwAlignBoundarySrc; ++ DWORD dwAlignSizeSrc; ++ DWORD dwAlignBoundaryDest; ++ DWORD dwAlignSizeDest; ++ DWORD dwAlignStrideAlign; ++ DWORD dwRops[DD_ROP_SPACE]; ++ DDSCAPS ddsOldCaps; ++ DWORD dwMinOverlayStretch; ++ DWORD dwMaxOverlayStretch; ++ DWORD dwMinLiveVideoStretch; ++ DWORD dwMaxLiveVideoStretch; ++ DWORD dwMinHwCodecStretch; ++ DWORD dwMaxHwCodecStretch; ++ DWORD dwReserved1; ++ DWORD dwReserved2; ++ DWORD dwReserved3; ++ DWORD dwSVBCaps; ++ DWORD dwSVBCKeyCaps; ++ DWORD dwSVBFXCaps; ++ DWORD dwSVBRops[DD_ROP_SPACE]; ++ DWORD dwVSBCaps; ++ DWORD dwVSBCKeyCaps; ++ DWORD dwVSBFXCaps; ++ DWORD dwVSBRops[DD_ROP_SPACE]; ++ DWORD dwSSBCaps; ++ DWORD dwSSBCKeyCaps; ++ DWORD dwSSBFXCaps; ++ DWORD dwSSBRops[DD_ROP_SPACE]; ++ DWORD dwMaxVideoPorts; ++ DWORD dwCurrVideoPorts; ++ DWORD dwSVBCaps2; ++ DWORD dwNLVBCaps; ++ DWORD dwNLVBCaps2; ++ DWORD dwNLVBCKeyCaps; ++ DWORD dwNLVBFXCaps; ++ DWORD dwNLVBRops[DD_ROP_SPACE]; ++ DDSCAPS2 ddsCaps; ++} DDCAPS, *LPDDCAPS; ++ ++typedef struct { ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwFourCC; ++ union { ++ DWORD dwRGBBitCount; ++ DWORD dwYUVBitCount; ++ DWORD dwZBufferBitDepth; ++ DWORD dwAlphaBitDepth; ++ DWORD dwLuminanceBitCount; ++ DWORD dwBumpBitCount; ++ DWORD dwPrivateFormatBitCount; ++ }; ++ union { ++ DWORD dwRBitMask; ++ DWORD dwYBitMask; ++ DWORD dwStencilBitDepth; ++ DWORD dwLuminanceBitMask; ++ DWORD dwBumpDuBitMask; ++ DWORD dwOperations; ++ }; ++ union { ++ DWORD dwGBitMask; ++ DWORD dwUBitMask; ++ DWORD dwZBitMask; ++ DWORD dwBumpDvBitMask; ++ struct { ++ WORD wFlipMSTypes; ++ WORD wBltMSTypes; ++ } MultiSampleCaps; ++ }; ++ union { ++ DWORD dwBBitMask; ++ DWORD dwVBitMask; ++ DWORD dwStencilBitMask; ++ DWORD dwBumpLuminanceBitMask; ++ }; ++ union { ++ DWORD dwRGBAlphaBitMask; ++ DWORD dwYUVAlphaBitMask; ++ DWORD dwLuminanceAlphaBitMask; ++ DWORD dwRGBZBitMask; ++ DWORD dwYUVZBitMask; ++ }; ++} DDPIXELFORMAT, * LPDDPIXELFORMAT; ++ ++typedef struct { ++ DWORD dwSize; ++ DWORD dwFlags; ++ DWORD dwHeight; ++ DWORD dwWidth; ++ union { ++ LONG lPitch; ++ DWORD dwLinearSize; ++ }; ++ DWORD dwBackBufferCount; ++ union { ++ DWORD dwMipMapCount; ++ DWORD dwZBufferBitDepth; ++ DWORD dwRefreshRate; ++ }; ++ DWORD dwAlphaBitDepth; ++ DWORD dwReserved; ++ LPVOID lpSurface; ++ DDCOLORKEY ddckCKDestOverlay; ++ DDCOLORKEY ddckCKDestBlt; ++ DDCOLORKEY ddckCKSrcOverlay; ++ DDCOLORKEY ddckCKSrcBlt; ++ DDPIXELFORMAT ddpfPixelFormat; ++ DDSCAPS ddsCaps; ++} DDSURFACEDESC, *LPDDSURFACEDESC; ++ ++typedef struct { ++ DWORD dwSize; ++ DWORD dwAlphaEdgeBlendBitDepth; ++ DWORD dwAlphaEdgeBlend; ++ DWORD dwReserved; ++ DWORD dwAlphaDestConstBitDepth; ++ union { ++ DWORD dwAlphaDestConst; ++ LPDIRECTDRAWSURFACE lpDDSAlphaDest; ++ }; ++ DWORD dwAlphaSrcConstBitDepth; ++ union { ++ DWORD dwAlphaSrcConst; ++ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; ++ }; ++ DDCOLORKEY dckDestColorkey; ++ DDCOLORKEY dckSrcColorkey; ++ DWORD dwDDFX; ++ DWORD dwFlags; ++} DDOVERLAYFX, *LPDDOVERLAYFX; ++ ++typedef HRESULT (WINAPI * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); ++typedef HRESULT (WINAPI * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); ++ ++#define INTERFACE IDirectDrawPalette ++DECLARE_INTERFACE_(IDirectDrawPalette, IUnknown) ++{ ++ STDMETHOD(GetCaps)(THIS_ LPDWORD) PURE; ++ STDMETHOD(GetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE; ++ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD, LPPALETTEENTRY) PURE; ++ STDMETHOD(SetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IDirectDrawClipper ++DECLARE_INTERFACE_(IDirectDrawClipper, IUnknown) ++{ ++ STDMETHOD(GetClipList)(THIS_ LPRECT, LPRGNDATA, LPDWORD) PURE; ++ STDMETHOD(GetHWnd)(THIS_ HWND *) PURE; ++ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD) PURE; ++ STDMETHOD(IsClipListChanged)(THIS_ BOOL *) PURE; ++ STDMETHOD(SetClipList)(THIS_ LPRGNDATA,DWORD) PURE; ++ STDMETHOD(SetHWnd)(THIS_ DWORD, HWND ) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IDirectDraw ++DECLARE_INTERFACE_(IDirectDraw, IUnknown) ++{ ++ STDMETHOD(Compact)(THIS) PURE; ++ STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE; ++ STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE; ++ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC, LPDIRECTDRAWSURFACE *, IUnknown *) PURE; ++ STDMETHOD(DuplicateSurface)( THIS_ LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE * ) PURE; ++ STDMETHOD(EnumDisplayModes)( THIS_ DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK ) PURE; ++ STDMETHOD(EnumSurfaces)(THIS_ DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK ) PURE; ++ STDMETHOD(FlipToGDISurface)(THIS) PURE; ++ STDMETHOD(GetCaps)( THIS_ LPDDCAPS, LPDDCAPS) PURE; ++ STDMETHOD(GetDisplayMode)( THIS_ LPDDSURFACEDESC) PURE; ++ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD, LPDWORD ) PURE; ++ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *) PURE; ++ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE; ++ STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE; ++ STDMETHOD(GetVerticalBlankStatus)(THIS_ LPBOOL ) PURE; ++ STDMETHOD(Initialize)(THIS_ GUID *) PURE; ++ STDMETHOD(RestoreDisplayMode)(THIS) PURE; ++ STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE; ++ STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD) PURE; ++ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IDirectDrawSurface ++DECLARE_INTERFACE_(IDirectDrawSurface, IUnknown) ++{ ++ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE; ++ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE; ++ STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE; ++ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE; ++ STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT,DWORD) PURE; ++ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE; ++ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE; ++ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE; ++ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; ++ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE *) PURE; ++ STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE; ++ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE; ++ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *) PURE; ++ STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; ++ STDMETHOD(GetDC)(THIS_ HDC *) PURE; ++ STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE; ++ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE; ++ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *) PURE; ++ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE; ++ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE; ++ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE; ++ STDMETHOD(IsLost)(THIS) PURE; ++ STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE; ++ STDMETHOD(ReleaseDC)(THIS_ HDC) PURE; ++ STDMETHOD(Restore)(THIS) PURE; ++ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE; ++ STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; ++ STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE; ++ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE; ++ STDMETHOD(Unlock)(THIS_ LPVOID) PURE; ++ STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE,LPRECT,DWORD, LPDDOVERLAYFX) PURE; ++ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE; ++ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE) PURE; ++}; ++#undef INTERFACE ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif //_DDRAW_H +\ Kein Zeilenumbruch am Dateiende. +diff -ruN a/include/dmodshow.h b/include/dmodshow.h +--- a/include/dmodshow.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/dmodshow.h 2009-03-09 16:54:08.000000000 +0100 +@@ -0,0 +1,23 @@ ++#ifndef _MODSHOW_H ++#define _MODSHOW_H ++#if __GNUC__ >= 3 ++#pragma GCC system_header ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20); ++EXTERN_C const IID IID_IDMOWrapperFilter; ++ ++#define INTERFACE IDMOWrapperFilter ++DECLARE_INTERFACE_(IDMOWrapperFilter, IUnknown) ++{ ++ STDMETHOD(Init)(THIS_ REFCLSID, REFCLSID) PURE; ++}; ++#undef INTERFACE ++#ifdef __cplusplus ++} ++#endif ++#endif +diff -ruN a/include/dmo.h b/include/dmo.h +--- a/include/dmo.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/dmo.h 2009-03-09 16:49:50.000000000 +0100 +@@ -0,0 +1,46 @@ ++#ifndef _DMO_H ++#define _DMO_H ++ ++#if __GNUC__ >= 3 ++#pragma GCC system_header ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++ ++typedef struct _DMO_PARTIAL_MEDIATYPE { ++ GUID type; ++ GUID subtype; ++} DMO_PARTIAL_MEDIATYPE; ++ ++typedef enum { ++ DMO_ENUMF_INCLUDE_KEYED = 0x00000001 ++} DMO_ENUM_FLAGS; ++ ++DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb); ++DECLARE_INTERFACE(IEnumDMO); ++ ++typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE; ++STDAPI DMOEnum(REFGUID, DWORD, DWORD, const DMO_PARTIAL_MEDIATYPE *, DWORD, const DMO_PARTIAL_MEDIATYPE *, ++ IEnumDMO **); ++STDAPI DMOGetName(REFCLSID, WCHAR [80]); ++ ++ ++#define INTERFACE IEnumDMO ++DECLARE_INTERFACE_(IEnumDMO, IUnknown) ++{ ++ STDMETHOD(Next)(THIS_ DWORD, CLSID *, WCHAR **, DWORD *) PURE; ++ STDMETHOD(Skip)(THIS_ DWORD) PURE; ++ STDMETHOD(Reset)(THIS) PURE; ++ STDMETHOD(Clone)(THIS_ IEnumDMO **) PURE; ++}; ++#undef INTERFACE ++ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif //_DMO_H +\ Kein Zeilenumbruch am Dateiende. +diff -ruN a/include/dshow.h b/include/dshow.h +--- a/include/dshow.h 2008-12-06 03:31:56.000000000 +0100 ++++ b/include/dshow.h 2010-04-12 17:12:52.000000000 +0200 +@@ -5,7 +5,10 @@ + #endif + + #include <strmif.h> ++#ifdef DSHOW_USE_AMAUDIO + #include <amaudio.h> ++#endif ++#include <control.h> + #include <amvideo.h> + #include <evcode.h> + #include <audevcod.h> +@@ -50,10 +53,6 @@ + AM_WST_STATE_Off = 0, + AM_WST_STATE_On + } AM_WST_STATE,*PAM_WST_STATE; +-typedef enum _AM_WST_STYLE { +- AM_WST_STYLE_None = 0, +- AM_WST_STYLE_Invers +-} AM_WST_STYLE,*PAM_WST_STYLE; + typedef enum { + AM_EXSEEK_CANSEEK= 1, + AM_EXSEEK_CANSCAN = 2, +@@ -63,6 +62,10 @@ + AM_EXSEEK_BUFFERING = 32, + AM_EXSEEK_SENDS_VIDEOFRAMEREADY = 64 + } AMExtendedSeekingCapabilities; ++typedef enum _AM_WST_STYLE { ++ AM_WST_STYLE_None = 0, ++ AM_WST_STYLE_Invers ++} AM_WST_STYLE,*PAM_WST_STYLE; + /*--- DirectShow Reference - DirectShow Structures */ + typedef struct _AM_WST_PAGE { + DWORD dwPageNr; +diff -ruN a/include/medparam.h b/include/medparam.h +--- a/include/medparam.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/medparam.h 2009-03-09 16:55:56.000000000 +0100 +@@ -0,0 +1,88 @@ ++#ifndef _MEDPARAM_H ++#define _MEDPARAM_H ++#if __GNUC__ >= 3 ++#pragma GCC system_header ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define MP_CAPS_CURVE_INVSQUARE ( MP_CURVE_INVSQUARE ) ++ ++/* typedefs */ ++typedef DWORD MP_CAPS; ++typedef float MP_DATA; ++typedef DWORD MP_TIMEDATA; ++typedef DWORD MP_FLAGS; ++ ++ ++/* enum */ ++typedef ++enum _MP_CURVE_TYPE { ++ MP_CURVE_JUMP = 0x1, ++ MP_CURVE_LINEAR = 0x2, ++ MP_CURVE_SQUARE = 0x4, ++ MP_CURVE_INVSQUARE = 0x8, ++ MP_CURVE_SINE = 0x10 ++} MP_CURVE_TYPE; ++ ++typedef ++enum _MP_Type { ++ MPT_INT = 0, ++ MPT_FLOAT = ( MPT_INT + 1 ) , ++ MPT_BOOL = ( MPT_FLOAT + 1 ) , ++ MPT_ENUM = ( MPT_BOOL + 1 ) , ++ MPT_MAX = ( MPT_ENUM + 1 ) ++} MP_TYPE; ++ ++/* structs */ ++ ++typedef struct _MP_PARAMINFO { ++ MP_TYPE mpType; ++ MP_CAPS mopCaps; ++ MP_DATA mpdMinValue; ++ MP_DATA mpdMaxValue; ++ MP_DATA mpdNeutralValue; ++ WCHAR szUnitText[32]; ++ WCHAR szLabel[32]; ++} MP_PARAMINFO; ++ ++typedef struct _MP_ENVELOPE_SEGMENT { ++ REFERENCE_TIME rtStart; ++ REFERENCE_TIME rtEnd; ++ MP_DATA valStart; ++ MP_DATA valEnd; ++ MP_CURVE_TYPE iCurve; ++ MP_FLAGS flags; ++} MP_ENVELOPE_SEGMENT; ++ ++/* interfaces */ ++EXTERN_C const IID IID_IMediaParamInfo; ++EXTERN_C const IID IID_IMediaParams; ++ ++#define INTERFACE IMediaParamInfo ++DECLARE_INTERFACE_(IMediaParamInfo, IUnknown) ++{ ++ STDMETHOD(GetParamCount)(THIS_ DWORD *) PURE; ++ STDMETHOD(GetParamInfo)(THIS_ DWORD, MP_PARAMINFO *) PURE; ++ STDMETHOD(GetParamText)(THIS_ DWORD, WCHAR **) PURE; ++ STDMETHOD(GetNumTimeFormats)(THIS_ DWORD *) PURE; ++ STDMETHOD(GetSupportedTimeFormat)(THIS_ DWORD, GUID *) PURE; ++ STDMETHOD(GetCurrentTimeFormat)(THIS_ GUID *, MP_TIMEDATA *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaParams ++DECLARE_INTERFACE_(IMediaParams, IUnknown) ++{ ++ STDMETHOD(GetParam)(THIS_ DWORD, MP_DATA *) PURE; ++ STDMETHOD(SetParam)(THIS_ DWORD, MP_DATA) PURE; ++ STDMETHOD(AddEnvelope)(THIS_ DWORD, DWORD, MP_ENVELOPE_SEGMENT *) PURE; ++ STDMETHOD(FlushEnvelope)(THIS_ DWORD, REFERENCE_TIME, REFERENCE_TIME) PURE; ++ STDMETHOD(SetTimeFormat)(THIS_ GUID, MP_TIMEDATA) PURE; ++}; ++#undef INTERFACE ++#ifdef __cplusplus ++} ++#endif ++#endif +diff -ruN a/include/qnetwork.h b/include/qnetwork.h +--- a/include/qnetwork.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/qnetwork.h 2009-03-09 16:15:46.000000000 +0100 +@@ -0,0 +1,49 @@ ++#ifndef _QNETWORK_H ++#define _QNETWORK_H ++ ++#if __GNUC__ >= 3 ++#pragma GCC system_header ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++DEFINE_GUID(IID_IAMMediaContent,0xFA2AA8F4L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00); ++DEFINE_GUID(IID_IAMNetworkStatus,0xFA2AA8F3L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00); ++ ++#define INTERFACE IAMMediaContent ++DECLARE_INTERFACE_(IAMMediaContent, IDispatch) ++{ ++ STDMETHOD(get_AuthorName)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_Title)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_Rating)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_Description)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_Copyright)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_BaseURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_LogoURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_LogoIconURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_WatermarkURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_MoreInfoURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_MoreInfoBannerImage)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_MoreInfoBannerURL)(THIS_ BSTR*) PURE; ++ STDMETHOD(get_MoreInfoText)(THIS_ BSTR*) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE(IAMNetworkStatus) ++DECLARE_INTERFACE_(IAMNetworkStatus, IDispatch) ++{ ++ STDMETHOD(get_ReceivedPackets)(THIS_ long*) PURE; ++ STDMETHOD(get_RecoveredPackets)(THIS_ long*) PURE; ++ STDMETHOD(get_LostPackets)(THIS_ long*) PURE; ++ STDMETHOD(get_ReceptionQuality)(THIS_ long*) PURE; ++ STDMETHOD(get_BufferingCount)(THIS_ long*) PURE; ++ STDMETHOD(get_IsBroadcast)(THIS_ VARIANT_BOOL*) PURE; ++ STDMETHOD(get_BufferingProgress)(THIS_ long*) PURE; ++}; ++#undef INTERFACE ++#ifdef __cplusplus ++} ++#endif ++ ++#endif //_QNETWORK_H +\ Kein Zeilenumbruch am Dateiende. +diff -ruN a/include/strmif.h b/include/strmif.h +--- a/include/strmif.h 2008-12-06 03:32:10.000000000 +0100 ++++ b/include/strmif.h 2010-04-12 17:12:52.000000000 +0200 +@@ -4,10 +4,79 @@ + #pragma GCC system_header + #endif + ++#include <ddraw.h> ++ + #ifdef __cplusplus + extern "C" { + #endif + ++#define MAX_FILTER_NAME 128 ++#define AM_GBF_NOTASYNCPOINT 2 ++ ++/*--- DirectShow Reference - Forward declarations of Interfaces and typedefs */ ++typedef DWORD_PTR HEVENT; ++typedef DWORD_PTR HSEMAPHORE; ++DECLARE_INTERFACE(IBaseFilter); ++DECLARE_INTERFACE(IPin); ++DECLARE_INTERFACE(IFilterGraph); ++DECLARE_INTERFACE(IEnumFilters); ++EXTERN_C const IID IID_IBaseFilter; ++EXTERN_C const IID IID_ICreateDevEnum; ++EXTERN_C const IID IID_IGraphBuilder; ++EXTERN_C const IID IID_IMediaSeeking; ++EXTERN_C const IID IID_IMediaEventSink; ++EXTERN_C const IID IID_IMemInputPin; ++EXTERN_C const IID IID_IEnumPins; ++EXTERN_C const IID IID_IMediaFilter; ++EXTERN_C const IID IID_IEnumMediaTypes; ++EXTERN_C const IID IID_IMemAllocator; ++EXTERN_C const IID IID_IPin; ++EXTERN_C const IID IID_IAsyncReader; ++ ++/* class ids*/ ++DEFINE_GUID(CLSID_AudioRender, ++0xe30629d1, 0x27e5, 0x11ce, 0x87, 0x5d, 0x0, 0x60, 0x8c, 0xb7, 0x80, 0x66); ++DEFINE_GUID(CLSID_SystemDeviceEnum, ++0x62BE5D10,0x60EB,0x11d0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86); ++DEFINE_GUID(CLSID_AudioRendererCategory, ++0xe0f158e1, 0xcb04, 0x11d0, 0xbd, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0xce, 0x86); ++DEFINE_GUID(CLSID_FilterGraph, ++0xe436ebb3, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++DEFINE_GUID(CLSID_InfTee, ++0xf8388a40, 0xd5bb, 0x11d0, 0xbe, 0x5a, 0x0, 0x80, 0xc7, 0x6, 0x56, 0x8e); ++DEFINE_GUID(CLSID_VideoMixingRenderer9, ++0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a); ++DEFINE_GUID(CLSID_MemoryAllocator, ++0x1e651cc0, 0xb199, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); ++ ++/*other types*/ ++DEFINE_GUID(MEDIATYPE_Audio, ++0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); ++DEFINE_GUID(MEDIATYPE_Video, ++0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); ++DEFINE_GUID(MEDIATYPE_Stream, ++0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++DEFINE_GUID(MEDIASUBTYPE_PCM, ++0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); ++DEFINE_GUID(MEDIASUBTYPE_WAVE, ++0xe436eb8b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++DEFINE_GUID(MEDIASUBTYPE_Avi, ++0xe436eb88, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++DEFINE_GUID(MEDIASUBTYPE_RGB32, ++0xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); ++DEFINE_GUID(MEDIASUBTYPE_YV12, ++0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); ++DEFINE_GUID(MEDIASUBTYPE_YUY2, ++0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); ++DEFINE_GUID(FORMAT_WaveFormatEx, ++0x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); ++DEFINE_GUID(FORMAT_VideoInfo, ++0x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); ++DEFINE_GUID(FORMAT_VideoInfo2, ++0xf72a76A0, 0xeb0a, 0x11d0, 0xac, 0xe4, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba); ++#define MEDIATYPE_NULL GUID_NULL ++#define MEDIASUBTYPE_NULL GUID_NULL ++ + /*--- DirectShow Reference - DirectShow Enumerated Types - TVAudioMode Enumeration */ + #define TVAUDIO_MODE_MASK 0x000000FF + #define TVAUDIO_PRESET_MASK 0x0000FF00 +@@ -24,6 +93,18 @@ + MERIT_HW_COMPRESSOR = 0x100050 + }; + /*--- DirectShow Reference - DirectShow Enumerated Types */ ++typedef ++enum AM_SEEKING_SeekingFlags { ++ AM_SEEKING_NoPositioning = 0, ++ AM_SEEKING_AbsolutePositioning = 0x1, ++ AM_SEEKING_RelativePositioning = 0x2, ++ AM_SEEKING_IncrementalPositioning = 0x3, ++ AM_SEEKING_PositioningBitsMask = 0x3, ++ AM_SEEKING_SeekToKeyFrame = 0x4, ++ AM_SEEKING_ReturnTime = 0x8, ++ AM_SEEKING_Segment = 0x10, ++ AM_SEEKING_NoFlush = 0x20 ++} AM_SEEKING_SEEKING_FLAGS; + typedef enum _AM_AUDIO_RENDERER_STAT_PARAM { + AM_AUDREND_STAT_PARAM_BREAK_COUNT = 1, + AM_AUDREND_STAT_PARAM_SLAVE_MODE, +@@ -452,7 +533,7 @@ + Famine, + Flood + } QualityMessageType; +-enum { ++typedef enum { + REG_PINFLAG_B_ZERO = 0x1, + REG_PINFLAG_B_RENDERER = 0x2, + REG_PINFLAG_B_MANY = 0x4, +@@ -613,6 +694,10 @@ + AMAP_DXVA_TARGET = 0x20 + } VMRSurfaceAllocationFlags; + /*--- DirectShow Reference - DirectShow Structures */ ++typedef struct _FilterInfo { ++ WCHAR achName[128]; ++ IFilterGraph *pGraph; ++} FILTER_INFO; + typedef struct _AllocatorProperties { + long cBuffers; + long cbBuffer; +@@ -731,10 +816,6 @@ + #define CK_NOCOLORKEY 0x00000000 + #define CK_INDEX 0x00000001 + #define CK_RGB 0x00000002 +-typedef struct { +- DWORD dw1; +- DWORD dw2; +-} DDCOLORKEY; + typedef struct tagDVD_AudioAttributes { + DVD_AUDIO_APPMODE AppMode; + DVD_AUDIO_FORMAT AudioFormat; +@@ -848,7 +929,7 @@ + BOOL fIsSourceLetterboxed; + BOOL fIsFilmMode; + } DVD_VideoAttributes; +-struct tagDVD_MenuAttributes { ++typedef struct tagDVD_MenuAttributes { + BOOL fCompatibleRegion[8]; + DVD_VideoAttributes VideoAttributes; + BOOL fAudioPresent; +@@ -1024,7 +1105,7 @@ + } VMRFrequency; + typedef struct tagVMRGUID { + GUID *pGUID; +- GUID GUID; ++ GUID _GUID; + } VMRGUID; + typedef struct tagVMRMONITORINFO { + VMRGUID guid; +@@ -1074,15 +1155,15 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,get_AvailableTVFormats)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,get_HorizontalLocked)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,get_NumberOfLines)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,get_OutputEnable)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,get_TVFormat)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,get_VCRHorizontalLocking)(THIS_ long*) PURE; +- STDMETHOD_(HRESULT,put_OutputEnable)(THIS_ long) PURE; +- STDMETHOD_(HRESULT,put_TVFormat)(THIS_ long) PURE; +- STDMETHOD_(HRESULT,put_VCRHorizontalLocking)(THIS_ long) PURE; ++ STDMETHOD(get_AvailableTVFormats)(THIS_ long*) PURE; ++ STDMETHOD(get_HorizontalLocked)(THIS_ long*) PURE; ++ STDMETHOD(get_NumberOfLines)(THIS_ long*) PURE; ++ STDMETHOD(get_OutputEnable)(THIS_ long*) PURE; ++ STDMETHOD(get_TVFormat)(THIS_ long*) PURE; ++ STDMETHOD(get_VCRHorizontalLocking)(THIS_ long*) PURE; ++ STDMETHOD(put_OutputEnable)(THIS_ long) PURE; ++ STDMETHOD(put_TVFormat)(THIS_ long) PURE; ++ STDMETHOD(put_VCRHorizontalLocking)(THIS_ long) PURE; + }; + #undef INTERFACE + #define INTERFACE IAMAudioInputMixer +@@ -1091,22 +1172,22 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,get_Bass)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,get_BassRange)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,get_Enable)(THIS_ BOOL*) PURE; +- STDMETHOD_(HRESULT,get_Loudness)(THIS_ BOOL*) PURE; +- STDMETHOD_(HRESULT,get_MixLevel)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,get_Mono)(THIS_ BOOL*) PURE; +- STDMETHOD_(HRESULT,get_Pan)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,get_Treble)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,get_TrebleRange)(THIS_ double*) PURE; +- STDMETHOD_(HRESULT,put_Bass)(THIS_ double) PURE; +- STDMETHOD_(HRESULT,put_Enable)(THIS_ BOOL) PURE; +- STDMETHOD_(HRESULT,put_Loudness)(THIS_ BOOL) PURE; +- STDMETHOD_(HRESULT,put_MixLevel)(THIS_ double) PURE; +- STDMETHOD_(HRESULT,put_Mono)(THIS_ BOOL) PURE; +- STDMETHOD_(HRESULT,put_Pan)(THIS_ double) PURE; +- STDMETHOD_(HRESULT,put_Treble)(THIS_ double) PURE; ++ STDMETHOD(get_Bass)(THIS_ double*) PURE; ++ STDMETHOD(get_BassRange)(THIS_ double*) PURE; ++ STDMETHOD(get_Enable)(THIS_ BOOL*) PURE; ++ STDMETHOD(get_Loudness)(THIS_ BOOL*) PURE; ++ STDMETHOD(get_MixLevel)(THIS_ double*) PURE; ++ STDMETHOD(get_Mono)(THIS_ BOOL*) PURE; ++ STDMETHOD(get_Pan)(THIS_ double*) PURE; ++ STDMETHOD(get_Treble)(THIS_ double*) PURE; ++ STDMETHOD(get_TrebleRange)(THIS_ double*) PURE; ++ STDMETHOD(put_Bass)(THIS_ double) PURE; ++ STDMETHOD(put_Enable)(THIS_ BOOL) PURE; ++ STDMETHOD(put_Loudness)(THIS_ BOOL) PURE; ++ STDMETHOD(put_MixLevel)(THIS_ double) PURE; ++ STDMETHOD(put_Mono)(THIS_ BOOL) PURE; ++ STDMETHOD(put_Pan)(THIS_ double) PURE; ++ STDMETHOD(put_Treble)(THIS_ double) PURE; + }; + #undef INTERFACE + #define INTERFACE IAMAudioRendererStats +@@ -1115,7 +1196,7 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE; ++ STDMETHOD(GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE; + }; + #undef INTERFACE + #define INTERFACE IAMBufferNegotiation +@@ -1124,8 +1205,8 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE; +- STDMETHOD_(HRESULT,SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE; ++ STDMETHOD(GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE; ++ STDMETHOD(SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE; + }; + #undef INTERFACE + #define INTERFACE IAMCameraControl +@@ -1134,9 +1215,9 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,Get)(THIS_ long,long*,long*) PURE; +- STDMETHOD_(HRESULT,GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE; +- STDMETHOD_(HRESULT,Set)(THIS_ long,long,long) PURE; ++ STDMETHOD(Get)(THIS_ long,long*,long*) PURE; ++ STDMETHOD(GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE; ++ STDMETHOD(Set)(THIS_ long,long,long) PURE; + }; + #undef INTERFACE + +@@ -1146,13 +1227,205 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD_(HRESULT,KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE; +- STDMETHOD_(HRESULT,ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE; +- STDMETHOD_(HRESULT,ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE; +- STDMETHOD_(HRESULT,SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE; ++ STDMETHOD(KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE; ++ STDMETHOD(ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE; ++ STDMETHOD(ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE; ++ STDMETHOD(SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IFilterGraph ++DECLARE_INTERFACE_(IFilterGraph ,IUnknown) ++{ ++ STDMETHOD(AddFilter)(THIS_ IBaseFilter *, LPCWSTR) PURE; ++ STDMETHOD(RemoveFilter)(THIS_ IBaseFilter *) PURE; ++ STDMETHOD(EnumFilters)(THIS_ IEnumFilters **) PURE; ++ STDMETHOD(FindFilterByName)(THIS_ LPCWSTR, IBaseFilter **) PURE; ++ STDMETHOD(ConnectDirect)(THIS_ IPin *, IPin *, const AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(Reconnect)(THIS_ IPin *) PURE; ++ STDMETHOD(Disconnect)(THIS_ IPin *) PURE; ++ STDMETHOD(SetDefaultSyncSource)(THIS) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IGraphBuilder ++DECLARE_INTERFACE_(IGraphBuilder ,IFilterGraph) ++{ ++ STDMETHOD(Connect)(THIS_ IPin *, IPin *) PURE; ++ STDMETHOD(Render)(THIS_ IPin *) PURE; ++ STDMETHOD(RenderFile)(THIS_ LPCWSTR, LPCWSTR) PURE; ++ STDMETHOD(AddSourceFilter)(THIS_ LPCWSTR, LPCWSTR, IBaseFilter **) PURE; ++ STDMETHOD(SetLogFile)(THIS_ DWORD_PTR) PURE; ++ STDMETHOD(Abort)(THIS) PURE; ++ STDMETHOD(ShouldOperationContinue)(THIS) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IReferenceClock ++DECLARE_INTERFACE_(IReferenceClock, IUnknown) ++{ ++ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *) PURE; ++ STDMETHOD(AdviseTime)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HEVENT, DWORD_PTR *) PURE; ++ STDMETHOD(AdvisePeriodic)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HSEMAPHORE, DWORD_PTR *) PURE; ++ STDMETHOD(Unadvise)(THIS_ DWORD_PTR) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IEnumFilters ++DECLARE_INTERFACE_(IEnumFilters, IUnknown) ++{ ++ STDMETHOD(Next)(THIS_ ULONG, IBaseFilter **, ULONG *) PURE; ++ STDMETHOD(Skip)(THIS_ ULONG) PURE; ++ STDMETHOD(Reset)(THIS) PURE; ++ STDMETHOD(Clone)(THIS_ IEnumFilters **) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IEnumMediaTypes ++DECLARE_INTERFACE_(IEnumMediaTypes, IUnknown) ++{ ++ STDMETHOD(Next)(THIS_ ULONG, AM_MEDIA_TYPE **, ULONG *) PURE; ++ STDMETHOD(Skip)(THIS_ ULONG) PURE; ++ STDMETHOD(Reset)(THIS) PURE; ++ STDMETHOD(Clone)(THIS_ IEnumMediaTypes **) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IEnumPins ++DECLARE_INTERFACE_(IEnumPins, IUnknown) ++{ ++ STDMETHOD(Next)(THIS_ ULONG, IPin **, ULONG *) PURE; ++ STDMETHOD(Skip)(THIS_ ULONG) PURE; ++ STDMETHOD(Reset)(THIS) PURE; ++ STDMETHOD(Clone)(THIS_ IEnumPins **) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IPin ++DECLARE_INTERFACE_(IPin, IUnknown) ++{ ++ STDMETHOD(Connect)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(ReceiveConnection)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(Disconnect)(THIS) PURE; ++ STDMETHOD(ConnectedTo)(THIS_ IPin **) PURE; ++ STDMETHOD(ConnectionMediaType)(THIS_ AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(QueryPinInfo)(THIS_ PIN_INFO *) PURE; ++ STDMETHOD(QueryDirection)(THIS_ PIN_DIRECTION *) PURE; ++ STDMETHOD(QueryId)(THIS_ LPWSTR *) PURE; ++ STDMETHOD(QueryAccept)(THIS_ const AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(EnumMediaTypes)(THIS_ IEnumMediaTypes **) PURE; ++ STDMETHOD(QueryInternalConnections)(THIS_ IPin **, ULONG *) PURE; ++ STDMETHOD(EndOfStream)(THIS) PURE; ++ STDMETHOD(BeginFlush)(THIS) PURE; ++ STDMETHOD(EndFlush)(THIS) PURE; ++ STDMETHOD(NewSegment)(THIS_ REFERENCE_TIME, REFERENCE_TIME, double) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaFilter ++DECLARE_INTERFACE_(IMediaFilter, IPersist) ++{ ++ STDMETHOD(Stop)(THIS) PURE; ++ STDMETHOD(Pause)(THIS) PURE; ++ STDMETHOD(Run)(THIS_ REFERENCE_TIME) PURE; ++ STDMETHOD(GetState)(THIS_ DWORD, FILTER_STATE *) PURE; ++ STDMETHOD(SetSyncSource)(THIS_ IReferenceClock *) PURE; ++ STDMETHOD(GetSyncSource)(THIS_ IReferenceClock **) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IBaseFilter ++DECLARE_INTERFACE_(IBaseFilter, IMediaFilter) ++{ ++ STDMETHOD(EnumPins)(THIS_ IEnumPins **) PURE; ++ STDMETHOD(FindPin)(THIS_ LPCWSTR, IPin **) PURE; ++ STDMETHOD(QueryFilterInfo)(THIS_ FILTER_INFO *) PURE; ++ STDMETHOD(JoinFilterGraph)(THIS_ IFilterGraph *, LPCWSTR) PURE; ++ STDMETHOD(QueryVendorInfo)(THIS_ LPWSTR *) PURE; + }; + #undef INTERFACE ++#define INTERFACE IMediaSeeking ++DECLARE_INTERFACE_(IMediaSeeking, IUnknown) ++{ ++ STDMETHOD(GetCapabilities)(THIS_ DWORD *) PURE; ++ STDMETHOD(CheckCapabilities)(THIS_ DWORD *) PURE; ++ STDMETHOD(IsFormatSupported)(THIS_ const GUID *) PURE; ++ STDMETHOD(QueryPreferredFormat)(THIS_ GUID *) PURE; ++ STDMETHOD(GetTimeFormat)(THIS_ GUID *) PURE; ++ STDMETHOD(IsUsingTimeFormat)(THIS_ const GUID *) PURE; ++ STDMETHOD(SetTimeFormat)(THIS_ const GUID *) PURE; ++ STDMETHOD(GetDuration)(THIS_ LONGLONG *) PURE; ++ STDMETHOD(GetStopPosition)(THIS_ LONGLONG *) PURE; ++ STDMETHOD(GetCurrentPosition)(THIS_ LONGLONG *) PURE; ++ STDMETHOD(ConvertTimeFormat)(THIS_ LONGLONG *, const GUID *, LONGLONG, const GUID *) PURE; ++ STDMETHOD(SetPositions)(THIS_ LONGLONG *, DWORD, LONGLONG *, DWORD) PURE; ++ STDMETHOD(GetPositions)(THIS_ LONGLONG *,LONGLONG *) PURE; ++ STDMETHOD(GetAvailable)(THIS_ LONGLONG *, LONGLONG *) PURE; ++ STDMETHOD(SetRate)(THIS_ double) PURE; ++ STDMETHOD(GetRate)(THIS_ double *) PURE; ++ STDMETHOD(GetPreroll)(THIS_ LONGLONG *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE ICreateDevEnum ++DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) ++{ ++ STDMETHOD(CreateClassEnumerator)(THIS_ REFCLSID, IEnumMoniker **, DWORD) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaSample ++DECLARE_INTERFACE_(IMediaSample, IUnknown) ++{ ++ STDMETHOD(GetPointer)(THIS_ BYTE **) PURE; ++ STDMETHOD_(long, GetSize)(THIS) PURE; ++ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE; ++ STDMETHOD(SetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE; ++ STDMETHOD(IsSyncPoint)(THIS) PURE; ++ STDMETHOD(SetSyncPoint)(THIS_ BOOL) PURE; ++ STDMETHOD(IsPreroll)(THIS) PURE; ++ STDMETHOD(SetPreroll)(THIS_ BOOL) PURE; ++ STDMETHOD_(long, GetActualDataLength)(THIS) PURE; ++ STDMETHOD(SetActualDataLength)(THIS_ long) PURE; ++ STDMETHOD(GetMediaType)(THIS_ AM_MEDIA_TYPE **) PURE; ++ STDMETHOD(SetMediaType)(THIS_ AM_MEDIA_TYPE *) PURE; ++ STDMETHOD(IsDiscontinuity)(THIS) PURE; ++ STDMETHOD(SetDiscontinuity)(THIS_ BOOL) PURE; ++ STDMETHOD(GetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE; ++ STDMETHOD(SetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMemAllocator ++DECLARE_INTERFACE_(IMemAllocator, IUnknown) ++{ ++ STDMETHOD(SetProperties)(THIS_ ALLOCATOR_PROPERTIES *, ALLOCATOR_PROPERTIES *) PURE; ++ STDMETHOD(GetProperties)(THIS_ ALLOCATOR_PROPERTIES *) PURE; ++ STDMETHOD(Commit)(THIS) PURE; ++ STDMETHOD(Decommit)(THIS) PURE; ++ STDMETHOD(GetBuffer)(THIS_ IMediaSample **, REFERENCE_TIME *, REFERENCE_TIME *, DWORD) PURE; ++ STDMETHOD(ReleaseBuffer)(THIS_ IMediaSample *) PURE; + ++}; ++#undef INTERFACE ++#define INTERFACE IAsyncReader ++DECLARE_INTERFACE_(IAsyncReader, IUnknown) ++{ ++ STDMETHOD(RequestAllocator)(THIS_ IMemAllocator *, ALLOCATOR_PROPERTIES *, IMemAllocator **) PURE; ++ STDMETHOD(Request)(THIS_ IMediaSample *, DWORD_PTR) PURE; ++ STDMETHOD(WaitForNext)(THIS_ DWORD, IMediaSample **, DWORD_PTR *) PURE; ++ STDMETHOD(SyncReadAligned)(THIS_ IMediaSample *) PURE; ++ STDMETHOD(SyncRead)(THIS_ LONGLONG, LONG, BYTE *) PURE; ++ STDMETHOD(Length)(THIS_ LONGLONG *, LONGLONG *) PURE; ++ STDMETHOD(BeginFlush)(THIS) PURE; ++ STDMETHOD(EndFlush)(THIS) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMediaEventSink ++DECLARE_INTERFACE_(IMediaEventSink, IUnknown) ++{ ++ STDMETHOD(Notify)(THIS_ long, LONG_PTR, LONG_PTR) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IMemInputPin ++DECLARE_INTERFACE_(IMemInputPin, IUnknown) ++{ ++ STDMETHOD(GetAllocator)(THIS_ IMemAllocator **) PURE; ++ STDMETHOD(NotifyAllocator)(THIS_ IMemAllocator *, BOOL) PURE; ++ STDMETHOD(GetAllocatorRequirements)(THIS_ ALLOCATOR_PROPERTIES *) PURE; ++ STDMETHOD(Receive)(THIS_ IMediaSample *) PURE; ++ STDMETHOD(ReceiveMultiple)(THIS_ IMediaSample **, long, long *) PURE; ++ STDMETHOD(ReceiveCanBlock)(THIS) PURE; ++}; ++#undef INTERFACE + #ifdef __cplusplus + } + #endif +diff -ruN a/include/vmr9.h b/include/vmr9.h +--- a/include/vmr9.h 2008-12-06 03:32:11.000000000 +0100 ++++ b/include/vmr9.h 2010-04-12 17:12:52.000000000 +0200 +@@ -8,6 +8,10 @@ + extern "C" { + #endif + ++EXTERN_C const IID IID_IVMRFilterConfig9; ++EXTERN_C const IID IID_IVMRWindowlessControl9; ++EXTERN_C const IID IID_IVMRMixerControl9; ++ + /*--- DirectShow Reference - DirectShow Enumerated Types */ + typedef enum _VMR9_SampleFormat { + VMR9_SampleReserved = 1, +@@ -61,7 +65,7 @@ + MixerPref9_RenderTargetRGB = 0x00001000, + MixerPref9_RenderTargetYUV = 0x00002000, + MixerPref9_RenderTargetReserved = 0x000FC000, +- MixerPref9_RenderTargetMask = 0x000FF000 ++ MixerPref9_RenderTargetMask = 0x000FF000, + MixerPref9_DynamicSwitchToBOB = 0x00100000, + MixerPref9_DynamicDecimateBy2 = 0x00200000, + MixerPref9_DynamicReserved = 0x00C00000, +@@ -128,7 +132,7 @@ + HMONITOR hMon; + DWORD dwFlags; + wchar_t szDevice[32]; +- wchar_t szDescription[512] ++ wchar_t szDescription[512]; + LARGE_INTEGER liDriverVersion; + DWORD dwVendorId; + DWORD dwDeviceId; +@@ -181,7 +185,6 @@ + VMR9Frequency InputSampleFreq; + VMR9Frequency OutputFrameFreq; + } VMR9VideoDesc; +-/********** + typedef struct VMR9VideoStreamInfo{ + IDirect3DSurface9 *pddsVideoSurface; + DWORD dwWidth; +@@ -203,8 +206,64 @@ + COLORREF clrSrcKey; + DWORD dwFilterMode; + }; +-**********/ +- ++#define INTERFACE IVMRImageCompositor9 ++DECLARE_INTERFACE_(IVMRImageCompositor9, IUnknown) ++{ ++ STDMETHOD(InitCompositionDevice)(THIS_ IUnknown *) PURE; ++ STDMETHOD(TermCompositionDevice)(THIS_ IUnknown *) PURE; ++ STDMETHOD(SetStreamMediaType)(THIS_ DWORD, AM_MEDIA_TYPE *, BOOL) PURE; ++ STDMETHOD(CompositeImage)(THIS_ IUnknown *, IDirect3DSurface9 *, AM_MEDIA_TYPE *, ++ REFERENCE_TIME, REFERENCE_TIME, D3DCOLOR, VMR9VideoStreamInfo *, UINT) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IVMRFilterConfig9 ++DECLARE_INTERFACE_(IVMRFilterConfig9, IUnknown) ++{ ++ STDMETHOD(SetImageCompositor)(THIS_ IVMRImageCompositor9 *) PURE; ++ STDMETHOD(SetNumberOfStreams)(THIS_ DWORD) PURE; ++ STDMETHOD(GetNumberOfStreams)(THIS_ DWORD *) PURE; ++ STDMETHOD(SetRenderingPrefs)(THIS_ DWORD) PURE; ++ STDMETHOD(GetRenderingPrefs)(THIS_ DWORD *) PURE; ++ STDMETHOD(SetRenderingMode)(THIS_ DWORD) PURE; ++ STDMETHOD(GetRenderingMode)(THIS_ DWORD *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IVMRWindowlessControl9 ++DECLARE_INTERFACE_(IVMRWindowlessControl9, IUnknown) ++{ ++ STDMETHOD(GetNativeVideoSize)(THIS_ LONG *, LONG *, LONG *, LONG *) PURE; ++ STDMETHOD(GetMinIdealVideoSize)(THIS_ LONG *, LONG *) PURE; ++ STDMETHOD(GetMaxIdealVideoSize)(THIS_ LONG *, LONG *) PURE; ++ STDMETHOD(SetVideoPosition)(THIS_ const LPRECT, const LPRECT) PURE; ++ STDMETHOD(GetVideoPosition)(THIS_ LPRECT, LPRECT) PURE; ++ STDMETHOD(GetAspectRatioMode)(THIS_ DWORD *) PURE; ++ STDMETHOD(SetAspectRatioMode)(THIS_ DWORD) PURE; ++ STDMETHOD(SetVideoClippingWindow)(THIS_ HWND) PURE; ++ STDMETHOD(RepaintVideo)(THIS_ HWND, HDC) PURE; ++ STDMETHOD(DisplayModeChanged)(THIS) PURE; ++ STDMETHOD(GetCurrentImage)(THIS_ BYTE **) PURE; ++ STDMETHOD(SetBorderColor)(THIS_ COLORREF) PURE; ++ STDMETHOD(GetBorderColor)(THIS_ COLORREF *) PURE; ++}; ++#undef INTERFACE ++#define INTERFACE IVMRMixerControl9 ++DECLARE_INTERFACE_(IVMRMixerControl9, IUnknown) ++{ ++ STDMETHOD(SetAlpha)(THIS_ DWORD, float) PURE; ++ STDMETHOD(GetAlpha)(THIS_ DWORD, float *) PURE; ++ STDMETHOD(SetZOrder)(THIS_ DWORD, DWORD) PURE; ++ STDMETHOD(GetZOrder)(THIS_ DWORD, DWORD *) PURE; ++ STDMETHOD(SetOutputRect)(THIS_ DWORD, const VMR9NormalizedRect *) PURE; ++ STDMETHOD(GetOutputRect)(THIS_ DWORD, VMR9NormalizedRect *) PURE; ++ STDMETHOD(SetBackgroundClr)(THIS_ COLORREF) PURE; ++ STDMETHOD(GetBackgroundClr)(THIS_ COLORREF *) PURE; ++ STDMETHOD(SetMixingPrefs)(THIS_ DWORD) PURE; ++ STDMETHOD(GetMixingPrefs)(THIS_ DWORD *) PURE; ++ STDMETHOD(SetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE; ++ STDMETHOD(GetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE; ++ STDMETHOD(GetProcAmpControlRange)(THIS_ DWORD, VMR9ProcAmpControlRange *) PURE; ++}; ++#undef INTERFACE + #ifdef __cplusplus + } + #endif
--- a/src/w32api-directx-additions-of-qt.patch Mon Apr 12 23:44:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1297 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch contains some DirectX additions for MinGW's w32api -which were provided by the Qt project. It was generated via -the following commands: - -#---------------------------------------------------------------------# -wget -c 'http://kent.dl.sourceforge.net/project/mingw/MinGW API for MS-Windows/w32api-3.13/w32api-3.13-mingw32-dev.tar.gz' -wget -c 'http://download.qt.nokia.com/misc/MinGW-gcc440_1.zip' -mkdir a -(cd a; tar -xf ../w32api-3.13-mingw32-dev.tar.gz include) -cp -r a b -unzip -j MinGW-gcc440_1.zip 'mingw/_patches/include.zip' -unzip -aa -p include.zip '*.patch' | patch -d b/include -p1 -(cd b/include; unzip -aa ../../include.zip '*.h') -diff -ruN a b > w32api-directx-additions-of-qt.patch -rm -rf a b include.zip -rm -f w32api-3.13-mingw32-dev.tar.gz MinGW-gcc440_1.zip -#---------------------------------------------------------------------# - - -diff -ruN a/include/amvideo.h b/include/amvideo.h ---- a/include/amvideo.h 2008-12-06 03:31:53.000000000 +0100 -+++ b/include/amvideo.h 2010-04-12 17:12:52.000000000 +0200 -@@ -52,10 +52,10 @@ - BITMAPINFOHEADER bmiHeader; - } VIDEOINFOHEADER; - typedef struct tagVIDEOINFO { -- RECT rcSource, -- RECT rcTarget, -- DWORD dwBitRate, -- DWORD dwBitErrorRate, -+ RECT rcSource; -+ RECT rcTarget; -+ DWORD dwBitRate; -+ DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - BITMAPINFOHEADER bmiHeader; - union { -diff -ruN a/include/bdatypes.h b/include/bdatypes.h ---- a/include/bdatypes.h 2008-12-06 03:31:53.000000000 +0100 -+++ b/include/bdatypes.h 2010-04-12 17:12:52.000000000 +0200 -@@ -17,9 +17,9 @@ - } MEDIA_SAMPLE_CONTENT; - /*--- DirectShow Reference - DirectShow Structures */ - typedef struct { -- DWORD dwOffset -- DWORD dwPacketLength -- DWORD dwStride -+ DWORD dwOffset; -+ DWORD dwPacketLength; -+ DWORD dwStride; - } MPEG2_TRANSPORT_STRIDE; - typedef struct { - ULONG ulPID; -diff -ruN a/include/control.h b/include/control.h ---- a/include/control.h 2008-12-06 03:31:54.000000000 +0100 -+++ b/include/control.h 2010-04-12 17:12:52.000000000 +0200 -@@ -11,7 +11,63 @@ - /*--- DirectShow Reference - DirectShow Data Types */ - typedef LONG_PTR OAEVENT; - typedef LONG_PTR OAHWND; -+typedef LONG OAFilterState; - -+DEFINE_GUID(IID_IBasicAudio,0x56a868b3,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); -+DEFINE_GUID(IID_IMediaControl,0x56a868b1,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); -+DEFINE_GUID(IID_IMediaEvent,0x56a868b6,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); -+DEFINE_GUID(IID_IMediaPosition,0x56a868b2,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70); -+ -+#define INTERFACE IMediaControl -+DECLARE_INTERFACE_(IMediaControl, IDispatch) -+{ -+ STDMETHOD(Run)(THIS) PURE; -+ STDMETHOD(Pause)(THIS) PURE; -+ STDMETHOD(Stop)(THIS) PURE; -+ STDMETHOD(GetState)(THIS_ LONG, OAFilterState *) PURE; -+ STDMETHOD(RenderFile)(THIS_ BSTR) PURE; -+ STDMETHOD(AddSourceFilter)(THIS_ BSTR, IDispatch **) PURE; -+ STDMETHOD(get_FilterCollection)(THIS_ IDispatch **) PURE; -+ STDMETHOD(get_RegFilterCollection)(IDispatch **) PURE; -+ STDMETHOD(StopWhenReady)(THIS) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IBasicAudio -+DECLARE_INTERFACE_(IBasicAudio, IDispatch) -+{ -+ STDMETHOD(put_Volume)(THIS_ long) PURE; -+ STDMETHOD(get_Volume)(THIS_ long *) PURE; -+ STDMETHOD(put_Balance)(THIS_ long) PURE; -+ STDMETHOD(get_Balance)(THIS_ long *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaPosition -+DECLARE_INTERFACE_(IMediaPosition, IDispatch) -+{ -+ STDMETHOD(get_Duration)(THIS_ REFTIME *) PURE; -+ STDMETHOD(put_CurrentPosition)(THIS_ REFTIME) PURE; -+ STDMETHOD(get_CurrentPosition)(THIS_ REFTIME *) PURE; -+ STDMETHOD(get_StopTime)(THIS_ REFTIME *) PURE; -+ STDMETHOD(put_StopTime)(THIS_ REFTIME) PURE; -+ STDMETHOD(get_PrerollTime)(THIS_ REFTIME *) PURE; -+ STDMETHOD(put_PrerollTime)(THIS_ REFTIME) PURE; -+ STDMETHOD(put_Rate)(THIS_ double) PURE; -+ STDMETHOD(get_Rate)(THIS_ double *) PURE; -+ STDMETHOD(CanSeekForward)(THIS_ LONG *) PURE; -+ STDMETHOD(CanSeekBackward)(THIS_ LONG *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaEvent -+DECLARE_INTERFACE_(IMediaEvent, IDispatch) -+{ -+ STDMETHOD(GetEventHandle)(THIS_ OAEVENT *) PURE; -+ STDMETHOD(GetEvent)(THIS_ long *, LONG_PTR *, LONG_PTR *, long) PURE; -+ STDMETHOD(WaitForCompletion)(THIS_ long,long *) PURE; -+ STDMETHOD(CancelDefaultHandling)(THIS_ long) PURE; -+ STDMETHOD(RestoreDefaultHandling)(THIS_ long) PURE; -+ STDMETHOD(FreeEventParams)(THIS_ long, LONG_PTR, LONG_PTR) PURE; -+}; -+#undef INTERFACE - #ifdef __cplusplus - } - #endif -diff -ruN a/include/ddraw.h b/include/ddraw.h ---- a/include/ddraw.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/ddraw.h 2009-03-09 15:37:42.000000000 +0100 -@@ -0,0 +1,344 @@ -+#ifndef _DDRAW_H -+#define _DDRAW_H -+ -+#if __GNUC__ >= 3 -+#pragma GCC system_header -+#endif -+ -+#include <objbase.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* interfaces */ -+DECLARE_INTERFACE(IDirectDraw); -+DECLARE_INTERFACE(IDirectDrawClipper); -+DECLARE_INTERFACE(IDirectDrawPalette); -+DECLARE_INTERFACE(IDirectDrawSurface); -+typedef IDirectDraw* LPDIRECTDRAW; -+typedef IDirectDrawClipper* LPDIRECTDRAWCLIPPER; -+typedef IDirectDrawPalette* LPDIRECTDRAWPALETTE; -+typedef IDirectDrawSurface* LPDIRECTDRAWSURFACE; -+ -+ -+#define DD_ROP_SPACE (256/32) -+ -+/* struct */ -+typedef struct { -+ DWORD dwColorSpaceLowValue; -+ DWORD dwColorSpaceHighValue; -+} DDCOLORKEY, *LPDDCOLORKEY; -+ -+typedef struct { -+ DWORD dwSize; -+ DWORD dwDDFX; -+ DWORD dwROP; -+ DWORD dwDDROP; -+ DWORD dwRotationAngle; -+ DWORD dwZBufferOpCode; -+ DWORD dwZBufferLow; -+ DWORD dwZBufferHigh; -+ DWORD dwZBufferBaseDest; -+ DWORD dwZDestConstBitDepth; -+ union { -+ DWORD dwZDestConst; -+ LPDIRECTDRAWSURFACE lpDDSZBufferDest; -+ }; -+ DWORD dwZSrcConstBitDepth; -+ union { -+ DWORD dwZSrcConst; -+ LPDIRECTDRAWSURFACE lpDDSZBufferSrc; -+ }; -+ DWORD dwAlphaEdgeBlendBitDepth; -+ DWORD dwAlphaEdgeBlend; -+ DWORD dwReserved; -+ DWORD dwAlphaDestConstBitDepth; -+ union { -+ DWORD dwAlphaDestConst; -+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; -+ }; -+ DWORD dwAlphaSrcConstBitDepth; -+ union { -+ DWORD dwAlphaSrcConst; -+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; -+ }; -+ union { -+ DWORD dwFillColor; -+ DWORD dwFillDepth; -+ DWORD dwFillPixel; -+ LPDIRECTDRAWSURFACE lpDDSPattern; -+ }; -+ DDCOLORKEY ddckDestColorkey; -+ DDCOLORKEY ddckSrcColorkey; -+} DDBLTFX, *LPDDBLTFX; -+ -+typedef struct { -+ LPRECT lprDest; -+ LPDIRECTDRAWSURFACE lpDDSSrc; -+ LPRECT lprSrc; -+ DWORD dwFlags; -+ LPDDBLTFX lpDDBltFx; -+} DDBLTBATCH, *LPDDBLTBATCH; -+ -+typedef struct { -+ DWORD dwCaps; -+} DDSCAPS, *LPDDSCAPS; -+ -+typedef struct -+{ -+ DWORD dwCaps; -+ DWORD dwCaps2; -+ DWORD dwCaps3; -+ union { -+ DWORD dwCaps4; -+ DWORD dwVolumeDepth; -+ }; -+} DDSCAPS2; -+ -+/*this is the DX7 version (we don't support any previous version)*/ -+typedef struct { -+ DWORD dwSize; -+ DWORD dwCaps; -+ DWORD dwCaps2; -+ DWORD dwCKeyCaps; -+ DWORD dwFXCaps; -+ DWORD dwFXAlphaCaps; -+ DWORD dwPalCaps; -+ DWORD dwSVCaps; -+ DWORD dwAlphaBltConstBitDepths; -+ DWORD dwAlphaBltPixelBitDepths; -+ DWORD dwAlphaBltSurfaceBitDepths; -+ DWORD dwAlphaOverlayConstBitDepths; -+ DWORD dwAlphaOverlayPixelBitDepths; -+ DWORD dwAlphaOverlaySurfaceBitDepths; -+ DWORD dwZBufferBitDepths; -+ DWORD dwVidMemTotal; -+ DWORD dwVidMemFree; -+ DWORD dwMaxVisibleOverlays; -+ DWORD dwCurrVisibleOverlays; -+ DWORD dwNumFourCCCodes; -+ DWORD dwAlignBoundarySrc; -+ DWORD dwAlignSizeSrc; -+ DWORD dwAlignBoundaryDest; -+ DWORD dwAlignSizeDest; -+ DWORD dwAlignStrideAlign; -+ DWORD dwRops[DD_ROP_SPACE]; -+ DDSCAPS ddsOldCaps; -+ DWORD dwMinOverlayStretch; -+ DWORD dwMaxOverlayStretch; -+ DWORD dwMinLiveVideoStretch; -+ DWORD dwMaxLiveVideoStretch; -+ DWORD dwMinHwCodecStretch; -+ DWORD dwMaxHwCodecStretch; -+ DWORD dwReserved1; -+ DWORD dwReserved2; -+ DWORD dwReserved3; -+ DWORD dwSVBCaps; -+ DWORD dwSVBCKeyCaps; -+ DWORD dwSVBFXCaps; -+ DWORD dwSVBRops[DD_ROP_SPACE]; -+ DWORD dwVSBCaps; -+ DWORD dwVSBCKeyCaps; -+ DWORD dwVSBFXCaps; -+ DWORD dwVSBRops[DD_ROP_SPACE]; -+ DWORD dwSSBCaps; -+ DWORD dwSSBCKeyCaps; -+ DWORD dwSSBFXCaps; -+ DWORD dwSSBRops[DD_ROP_SPACE]; -+ DWORD dwMaxVideoPorts; -+ DWORD dwCurrVideoPorts; -+ DWORD dwSVBCaps2; -+ DWORD dwNLVBCaps; -+ DWORD dwNLVBCaps2; -+ DWORD dwNLVBCKeyCaps; -+ DWORD dwNLVBFXCaps; -+ DWORD dwNLVBRops[DD_ROP_SPACE]; -+ DDSCAPS2 ddsCaps; -+} DDCAPS, *LPDDCAPS; -+ -+typedef struct { -+ DWORD dwSize; -+ DWORD dwFlags; -+ DWORD dwFourCC; -+ union { -+ DWORD dwRGBBitCount; -+ DWORD dwYUVBitCount; -+ DWORD dwZBufferBitDepth; -+ DWORD dwAlphaBitDepth; -+ DWORD dwLuminanceBitCount; -+ DWORD dwBumpBitCount; -+ DWORD dwPrivateFormatBitCount; -+ }; -+ union { -+ DWORD dwRBitMask; -+ DWORD dwYBitMask; -+ DWORD dwStencilBitDepth; -+ DWORD dwLuminanceBitMask; -+ DWORD dwBumpDuBitMask; -+ DWORD dwOperations; -+ }; -+ union { -+ DWORD dwGBitMask; -+ DWORD dwUBitMask; -+ DWORD dwZBitMask; -+ DWORD dwBumpDvBitMask; -+ struct { -+ WORD wFlipMSTypes; -+ WORD wBltMSTypes; -+ } MultiSampleCaps; -+ }; -+ union { -+ DWORD dwBBitMask; -+ DWORD dwVBitMask; -+ DWORD dwStencilBitMask; -+ DWORD dwBumpLuminanceBitMask; -+ }; -+ union { -+ DWORD dwRGBAlphaBitMask; -+ DWORD dwYUVAlphaBitMask; -+ DWORD dwLuminanceAlphaBitMask; -+ DWORD dwRGBZBitMask; -+ DWORD dwYUVZBitMask; -+ }; -+} DDPIXELFORMAT, * LPDDPIXELFORMAT; -+ -+typedef struct { -+ DWORD dwSize; -+ DWORD dwFlags; -+ DWORD dwHeight; -+ DWORD dwWidth; -+ union { -+ LONG lPitch; -+ DWORD dwLinearSize; -+ }; -+ DWORD dwBackBufferCount; -+ union { -+ DWORD dwMipMapCount; -+ DWORD dwZBufferBitDepth; -+ DWORD dwRefreshRate; -+ }; -+ DWORD dwAlphaBitDepth; -+ DWORD dwReserved; -+ LPVOID lpSurface; -+ DDCOLORKEY ddckCKDestOverlay; -+ DDCOLORKEY ddckCKDestBlt; -+ DDCOLORKEY ddckCKSrcOverlay; -+ DDCOLORKEY ddckCKSrcBlt; -+ DDPIXELFORMAT ddpfPixelFormat; -+ DDSCAPS ddsCaps; -+} DDSURFACEDESC, *LPDDSURFACEDESC; -+ -+typedef struct { -+ DWORD dwSize; -+ DWORD dwAlphaEdgeBlendBitDepth; -+ DWORD dwAlphaEdgeBlend; -+ DWORD dwReserved; -+ DWORD dwAlphaDestConstBitDepth; -+ union { -+ DWORD dwAlphaDestConst; -+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; -+ }; -+ DWORD dwAlphaSrcConstBitDepth; -+ union { -+ DWORD dwAlphaSrcConst; -+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; -+ }; -+ DDCOLORKEY dckDestColorkey; -+ DDCOLORKEY dckSrcColorkey; -+ DWORD dwDDFX; -+ DWORD dwFlags; -+} DDOVERLAYFX, *LPDDOVERLAYFX; -+ -+typedef HRESULT (WINAPI * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); -+typedef HRESULT (WINAPI * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); -+ -+#define INTERFACE IDirectDrawPalette -+DECLARE_INTERFACE_(IDirectDrawPalette, IUnknown) -+{ -+ STDMETHOD(GetCaps)(THIS_ LPDWORD) PURE; -+ STDMETHOD(GetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE; -+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD, LPPALETTEENTRY) PURE; -+ STDMETHOD(SetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IDirectDrawClipper -+DECLARE_INTERFACE_(IDirectDrawClipper, IUnknown) -+{ -+ STDMETHOD(GetClipList)(THIS_ LPRECT, LPRGNDATA, LPDWORD) PURE; -+ STDMETHOD(GetHWnd)(THIS_ HWND *) PURE; -+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD) PURE; -+ STDMETHOD(IsClipListChanged)(THIS_ BOOL *) PURE; -+ STDMETHOD(SetClipList)(THIS_ LPRGNDATA,DWORD) PURE; -+ STDMETHOD(SetHWnd)(THIS_ DWORD, HWND ) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IDirectDraw -+DECLARE_INTERFACE_(IDirectDraw, IUnknown) -+{ -+ STDMETHOD(Compact)(THIS) PURE; -+ STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE; -+ STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE; -+ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC, LPDIRECTDRAWSURFACE *, IUnknown *) PURE; -+ STDMETHOD(DuplicateSurface)( THIS_ LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE * ) PURE; -+ STDMETHOD(EnumDisplayModes)( THIS_ DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK ) PURE; -+ STDMETHOD(EnumSurfaces)(THIS_ DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK ) PURE; -+ STDMETHOD(FlipToGDISurface)(THIS) PURE; -+ STDMETHOD(GetCaps)( THIS_ LPDDCAPS, LPDDCAPS) PURE; -+ STDMETHOD(GetDisplayMode)( THIS_ LPDDSURFACEDESC) PURE; -+ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD, LPDWORD ) PURE; -+ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *) PURE; -+ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE; -+ STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE; -+ STDMETHOD(GetVerticalBlankStatus)(THIS_ LPBOOL ) PURE; -+ STDMETHOD(Initialize)(THIS_ GUID *) PURE; -+ STDMETHOD(RestoreDisplayMode)(THIS) PURE; -+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE; -+ STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD) PURE; -+ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IDirectDrawSurface -+DECLARE_INTERFACE_(IDirectDrawSurface, IUnknown) -+{ -+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE; -+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE; -+ STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE; -+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE; -+ STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT,DWORD) PURE; -+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE; -+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE; -+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE; -+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; -+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE *) PURE; -+ STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE; -+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE; -+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *) PURE; -+ STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; -+ STDMETHOD(GetDC)(THIS_ HDC *) PURE; -+ STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE; -+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE; -+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *) PURE; -+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE; -+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE; -+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE; -+ STDMETHOD(IsLost)(THIS) PURE; -+ STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE; -+ STDMETHOD(ReleaseDC)(THIS_ HDC) PURE; -+ STDMETHOD(Restore)(THIS) PURE; -+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE; -+ STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; -+ STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE; -+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE; -+ STDMETHOD(Unlock)(THIS_ LPVOID) PURE; -+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE,LPRECT,DWORD, LPDDOVERLAYFX) PURE; -+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE; -+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE) PURE; -+}; -+#undef INTERFACE -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif //_DDRAW_H -\ Kein Zeilenumbruch am Dateiende. -diff -ruN a/include/dmodshow.h b/include/dmodshow.h ---- a/include/dmodshow.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/dmodshow.h 2009-03-09 16:54:08.000000000 +0100 -@@ -0,0 +1,23 @@ -+#ifndef _MODSHOW_H -+#define _MODSHOW_H -+#if __GNUC__ >= 3 -+#pragma GCC system_header -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20); -+EXTERN_C const IID IID_IDMOWrapperFilter; -+ -+#define INTERFACE IDMOWrapperFilter -+DECLARE_INTERFACE_(IDMOWrapperFilter, IUnknown) -+{ -+ STDMETHOD(Init)(THIS_ REFCLSID, REFCLSID) PURE; -+}; -+#undef INTERFACE -+#ifdef __cplusplus -+} -+#endif -+#endif -diff -ruN a/include/dmo.h b/include/dmo.h ---- a/include/dmo.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/dmo.h 2009-03-09 16:49:50.000000000 +0100 -@@ -0,0 +1,46 @@ -+#ifndef _DMO_H -+#define _DMO_H -+ -+#if __GNUC__ >= 3 -+#pragma GCC system_header -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+typedef struct _DMO_PARTIAL_MEDIATYPE { -+ GUID type; -+ GUID subtype; -+} DMO_PARTIAL_MEDIATYPE; -+ -+typedef enum { -+ DMO_ENUMF_INCLUDE_KEYED = 0x00000001 -+} DMO_ENUM_FLAGS; -+ -+DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb); -+DECLARE_INTERFACE(IEnumDMO); -+ -+typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE; -+STDAPI DMOEnum(REFGUID, DWORD, DWORD, const DMO_PARTIAL_MEDIATYPE *, DWORD, const DMO_PARTIAL_MEDIATYPE *, -+ IEnumDMO **); -+STDAPI DMOGetName(REFCLSID, WCHAR [80]); -+ -+ -+#define INTERFACE IEnumDMO -+DECLARE_INTERFACE_(IEnumDMO, IUnknown) -+{ -+ STDMETHOD(Next)(THIS_ DWORD, CLSID *, WCHAR **, DWORD *) PURE; -+ STDMETHOD(Skip)(THIS_ DWORD) PURE; -+ STDMETHOD(Reset)(THIS) PURE; -+ STDMETHOD(Clone)(THIS_ IEnumDMO **) PURE; -+}; -+#undef INTERFACE -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif //_DMO_H -\ Kein Zeilenumbruch am Dateiende. -diff -ruN a/include/dshow.h b/include/dshow.h ---- a/include/dshow.h 2008-12-06 03:31:56.000000000 +0100 -+++ b/include/dshow.h 2010-04-12 17:12:52.000000000 +0200 -@@ -5,7 +5,10 @@ - #endif - - #include <strmif.h> -+#ifdef DSHOW_USE_AMAUDIO - #include <amaudio.h> -+#endif -+#include <control.h> - #include <amvideo.h> - #include <evcode.h> - #include <audevcod.h> -@@ -50,10 +53,6 @@ - AM_WST_STATE_Off = 0, - AM_WST_STATE_On - } AM_WST_STATE,*PAM_WST_STATE; --typedef enum _AM_WST_STYLE { -- AM_WST_STYLE_None = 0, -- AM_WST_STYLE_Invers --} AM_WST_STYLE,*PAM_WST_STYLE; - typedef enum { - AM_EXSEEK_CANSEEK= 1, - AM_EXSEEK_CANSCAN = 2, -@@ -63,6 +62,10 @@ - AM_EXSEEK_BUFFERING = 32, - AM_EXSEEK_SENDS_VIDEOFRAMEREADY = 64 - } AMExtendedSeekingCapabilities; -+typedef enum _AM_WST_STYLE { -+ AM_WST_STYLE_None = 0, -+ AM_WST_STYLE_Invers -+} AM_WST_STYLE,*PAM_WST_STYLE; - /*--- DirectShow Reference - DirectShow Structures */ - typedef struct _AM_WST_PAGE { - DWORD dwPageNr; -diff -ruN a/include/medparam.h b/include/medparam.h ---- a/include/medparam.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/medparam.h 2009-03-09 16:55:56.000000000 +0100 -@@ -0,0 +1,88 @@ -+#ifndef _MEDPARAM_H -+#define _MEDPARAM_H -+#if __GNUC__ >= 3 -+#pragma GCC system_header -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define MP_CAPS_CURVE_INVSQUARE ( MP_CURVE_INVSQUARE ) -+ -+/* typedefs */ -+typedef DWORD MP_CAPS; -+typedef float MP_DATA; -+typedef DWORD MP_TIMEDATA; -+typedef DWORD MP_FLAGS; -+ -+ -+/* enum */ -+typedef -+enum _MP_CURVE_TYPE { -+ MP_CURVE_JUMP = 0x1, -+ MP_CURVE_LINEAR = 0x2, -+ MP_CURVE_SQUARE = 0x4, -+ MP_CURVE_INVSQUARE = 0x8, -+ MP_CURVE_SINE = 0x10 -+} MP_CURVE_TYPE; -+ -+typedef -+enum _MP_Type { -+ MPT_INT = 0, -+ MPT_FLOAT = ( MPT_INT + 1 ) , -+ MPT_BOOL = ( MPT_FLOAT + 1 ) , -+ MPT_ENUM = ( MPT_BOOL + 1 ) , -+ MPT_MAX = ( MPT_ENUM + 1 ) -+} MP_TYPE; -+ -+/* structs */ -+ -+typedef struct _MP_PARAMINFO { -+ MP_TYPE mpType; -+ MP_CAPS mopCaps; -+ MP_DATA mpdMinValue; -+ MP_DATA mpdMaxValue; -+ MP_DATA mpdNeutralValue; -+ WCHAR szUnitText[32]; -+ WCHAR szLabel[32]; -+} MP_PARAMINFO; -+ -+typedef struct _MP_ENVELOPE_SEGMENT { -+ REFERENCE_TIME rtStart; -+ REFERENCE_TIME rtEnd; -+ MP_DATA valStart; -+ MP_DATA valEnd; -+ MP_CURVE_TYPE iCurve; -+ MP_FLAGS flags; -+} MP_ENVELOPE_SEGMENT; -+ -+/* interfaces */ -+EXTERN_C const IID IID_IMediaParamInfo; -+EXTERN_C const IID IID_IMediaParams; -+ -+#define INTERFACE IMediaParamInfo -+DECLARE_INTERFACE_(IMediaParamInfo, IUnknown) -+{ -+ STDMETHOD(GetParamCount)(THIS_ DWORD *) PURE; -+ STDMETHOD(GetParamInfo)(THIS_ DWORD, MP_PARAMINFO *) PURE; -+ STDMETHOD(GetParamText)(THIS_ DWORD, WCHAR **) PURE; -+ STDMETHOD(GetNumTimeFormats)(THIS_ DWORD *) PURE; -+ STDMETHOD(GetSupportedTimeFormat)(THIS_ DWORD, GUID *) PURE; -+ STDMETHOD(GetCurrentTimeFormat)(THIS_ GUID *, MP_TIMEDATA *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaParams -+DECLARE_INTERFACE_(IMediaParams, IUnknown) -+{ -+ STDMETHOD(GetParam)(THIS_ DWORD, MP_DATA *) PURE; -+ STDMETHOD(SetParam)(THIS_ DWORD, MP_DATA) PURE; -+ STDMETHOD(AddEnvelope)(THIS_ DWORD, DWORD, MP_ENVELOPE_SEGMENT *) PURE; -+ STDMETHOD(FlushEnvelope)(THIS_ DWORD, REFERENCE_TIME, REFERENCE_TIME) PURE; -+ STDMETHOD(SetTimeFormat)(THIS_ GUID, MP_TIMEDATA) PURE; -+}; -+#undef INTERFACE -+#ifdef __cplusplus -+} -+#endif -+#endif -diff -ruN a/include/qnetwork.h b/include/qnetwork.h ---- a/include/qnetwork.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/qnetwork.h 2009-03-09 16:15:46.000000000 +0100 -@@ -0,0 +1,49 @@ -+#ifndef _QNETWORK_H -+#define _QNETWORK_H -+ -+#if __GNUC__ >= 3 -+#pragma GCC system_header -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+DEFINE_GUID(IID_IAMMediaContent,0xFA2AA8F4L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00); -+DEFINE_GUID(IID_IAMNetworkStatus,0xFA2AA8F3L,0x8B62,0x11D0,0xA5,0x20,0x00,0x00,0x00,0x00,0x00,0x00); -+ -+#define INTERFACE IAMMediaContent -+DECLARE_INTERFACE_(IAMMediaContent, IDispatch) -+{ -+ STDMETHOD(get_AuthorName)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_Title)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_Rating)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_Description)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_Copyright)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_BaseURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_LogoURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_LogoIconURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_WatermarkURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_MoreInfoURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_MoreInfoBannerImage)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_MoreInfoBannerURL)(THIS_ BSTR*) PURE; -+ STDMETHOD(get_MoreInfoText)(THIS_ BSTR*) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE(IAMNetworkStatus) -+DECLARE_INTERFACE_(IAMNetworkStatus, IDispatch) -+{ -+ STDMETHOD(get_ReceivedPackets)(THIS_ long*) PURE; -+ STDMETHOD(get_RecoveredPackets)(THIS_ long*) PURE; -+ STDMETHOD(get_LostPackets)(THIS_ long*) PURE; -+ STDMETHOD(get_ReceptionQuality)(THIS_ long*) PURE; -+ STDMETHOD(get_BufferingCount)(THIS_ long*) PURE; -+ STDMETHOD(get_IsBroadcast)(THIS_ VARIANT_BOOL*) PURE; -+ STDMETHOD(get_BufferingProgress)(THIS_ long*) PURE; -+}; -+#undef INTERFACE -+#ifdef __cplusplus -+} -+#endif -+ -+#endif //_QNETWORK_H -\ Kein Zeilenumbruch am Dateiende. -diff -ruN a/include/strmif.h b/include/strmif.h ---- a/include/strmif.h 2008-12-06 03:32:10.000000000 +0100 -+++ b/include/strmif.h 2010-04-12 17:12:52.000000000 +0200 -@@ -4,10 +4,79 @@ - #pragma GCC system_header - #endif - -+#include <ddraw.h> -+ - #ifdef __cplusplus - extern "C" { - #endif - -+#define MAX_FILTER_NAME 128 -+#define AM_GBF_NOTASYNCPOINT 2 -+ -+/*--- DirectShow Reference - Forward declarations of Interfaces and typedefs */ -+typedef DWORD_PTR HEVENT; -+typedef DWORD_PTR HSEMAPHORE; -+DECLARE_INTERFACE(IBaseFilter); -+DECLARE_INTERFACE(IPin); -+DECLARE_INTERFACE(IFilterGraph); -+DECLARE_INTERFACE(IEnumFilters); -+EXTERN_C const IID IID_IBaseFilter; -+EXTERN_C const IID IID_ICreateDevEnum; -+EXTERN_C const IID IID_IGraphBuilder; -+EXTERN_C const IID IID_IMediaSeeking; -+EXTERN_C const IID IID_IMediaEventSink; -+EXTERN_C const IID IID_IMemInputPin; -+EXTERN_C const IID IID_IEnumPins; -+EXTERN_C const IID IID_IMediaFilter; -+EXTERN_C const IID IID_IEnumMediaTypes; -+EXTERN_C const IID IID_IMemAllocator; -+EXTERN_C const IID IID_IPin; -+EXTERN_C const IID IID_IAsyncReader; -+ -+/* class ids*/ -+DEFINE_GUID(CLSID_AudioRender, -+0xe30629d1, 0x27e5, 0x11ce, 0x87, 0x5d, 0x0, 0x60, 0x8c, 0xb7, 0x80, 0x66); -+DEFINE_GUID(CLSID_SystemDeviceEnum, -+0x62BE5D10,0x60EB,0x11d0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86); -+DEFINE_GUID(CLSID_AudioRendererCategory, -+0xe0f158e1, 0xcb04, 0x11d0, 0xbd, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0xce, 0x86); -+DEFINE_GUID(CLSID_FilterGraph, -+0xe436ebb3, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); -+DEFINE_GUID(CLSID_InfTee, -+0xf8388a40, 0xd5bb, 0x11d0, 0xbe, 0x5a, 0x0, 0x80, 0xc7, 0x6, 0x56, 0x8e); -+DEFINE_GUID(CLSID_VideoMixingRenderer9, -+0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a); -+DEFINE_GUID(CLSID_MemoryAllocator, -+0x1e651cc0, 0xb199, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -+ -+/*other types*/ -+DEFINE_GUID(MEDIATYPE_Audio, -+0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+DEFINE_GUID(MEDIATYPE_Video, -+0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+DEFINE_GUID(MEDIATYPE_Stream, -+0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); -+DEFINE_GUID(MEDIASUBTYPE_PCM, -+0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -+DEFINE_GUID(MEDIASUBTYPE_WAVE, -+0xe436eb8b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); -+DEFINE_GUID(MEDIASUBTYPE_Avi, -+0xe436eb88, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); -+DEFINE_GUID(MEDIASUBTYPE_RGB32, -+0xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); -+DEFINE_GUID(MEDIASUBTYPE_YV12, -+0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+DEFINE_GUID(MEDIASUBTYPE_YUY2, -+0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -+DEFINE_GUID(FORMAT_WaveFormatEx, -+0x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); -+DEFINE_GUID(FORMAT_VideoInfo, -+0x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a); -+DEFINE_GUID(FORMAT_VideoInfo2, -+0xf72a76A0, 0xeb0a, 0x11d0, 0xac, 0xe4, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba); -+#define MEDIATYPE_NULL GUID_NULL -+#define MEDIASUBTYPE_NULL GUID_NULL -+ - /*--- DirectShow Reference - DirectShow Enumerated Types - TVAudioMode Enumeration */ - #define TVAUDIO_MODE_MASK 0x000000FF - #define TVAUDIO_PRESET_MASK 0x0000FF00 -@@ -24,6 +93,18 @@ - MERIT_HW_COMPRESSOR = 0x100050 - }; - /*--- DirectShow Reference - DirectShow Enumerated Types */ -+typedef -+enum AM_SEEKING_SeekingFlags { -+ AM_SEEKING_NoPositioning = 0, -+ AM_SEEKING_AbsolutePositioning = 0x1, -+ AM_SEEKING_RelativePositioning = 0x2, -+ AM_SEEKING_IncrementalPositioning = 0x3, -+ AM_SEEKING_PositioningBitsMask = 0x3, -+ AM_SEEKING_SeekToKeyFrame = 0x4, -+ AM_SEEKING_ReturnTime = 0x8, -+ AM_SEEKING_Segment = 0x10, -+ AM_SEEKING_NoFlush = 0x20 -+} AM_SEEKING_SEEKING_FLAGS; - typedef enum _AM_AUDIO_RENDERER_STAT_PARAM { - AM_AUDREND_STAT_PARAM_BREAK_COUNT = 1, - AM_AUDREND_STAT_PARAM_SLAVE_MODE, -@@ -452,7 +533,7 @@ - Famine, - Flood - } QualityMessageType; --enum { -+typedef enum { - REG_PINFLAG_B_ZERO = 0x1, - REG_PINFLAG_B_RENDERER = 0x2, - REG_PINFLAG_B_MANY = 0x4, -@@ -613,6 +694,10 @@ - AMAP_DXVA_TARGET = 0x20 - } VMRSurfaceAllocationFlags; - /*--- DirectShow Reference - DirectShow Structures */ -+typedef struct _FilterInfo { -+ WCHAR achName[128]; -+ IFilterGraph *pGraph; -+} FILTER_INFO; - typedef struct _AllocatorProperties { - long cBuffers; - long cbBuffer; -@@ -731,10 +816,6 @@ - #define CK_NOCOLORKEY 0x00000000 - #define CK_INDEX 0x00000001 - #define CK_RGB 0x00000002 --typedef struct { -- DWORD dw1; -- DWORD dw2; --} DDCOLORKEY; - typedef struct tagDVD_AudioAttributes { - DVD_AUDIO_APPMODE AppMode; - DVD_AUDIO_FORMAT AudioFormat; -@@ -848,7 +929,7 @@ - BOOL fIsSourceLetterboxed; - BOOL fIsFilmMode; - } DVD_VideoAttributes; --struct tagDVD_MenuAttributes { -+typedef struct tagDVD_MenuAttributes { - BOOL fCompatibleRegion[8]; - DVD_VideoAttributes VideoAttributes; - BOOL fAudioPresent; -@@ -1024,7 +1105,7 @@ - } VMRFrequency; - typedef struct tagVMRGUID { - GUID *pGUID; -- GUID GUID; -+ GUID _GUID; - } VMRGUID; - typedef struct tagVMRMONITORINFO { - VMRGUID guid; -@@ -1074,15 +1155,15 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,get_AvailableTVFormats)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,get_HorizontalLocked)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,get_NumberOfLines)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,get_OutputEnable)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,get_TVFormat)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,get_VCRHorizontalLocking)(THIS_ long*) PURE; -- STDMETHOD_(HRESULT,put_OutputEnable)(THIS_ long) PURE; -- STDMETHOD_(HRESULT,put_TVFormat)(THIS_ long) PURE; -- STDMETHOD_(HRESULT,put_VCRHorizontalLocking)(THIS_ long) PURE; -+ STDMETHOD(get_AvailableTVFormats)(THIS_ long*) PURE; -+ STDMETHOD(get_HorizontalLocked)(THIS_ long*) PURE; -+ STDMETHOD(get_NumberOfLines)(THIS_ long*) PURE; -+ STDMETHOD(get_OutputEnable)(THIS_ long*) PURE; -+ STDMETHOD(get_TVFormat)(THIS_ long*) PURE; -+ STDMETHOD(get_VCRHorizontalLocking)(THIS_ long*) PURE; -+ STDMETHOD(put_OutputEnable)(THIS_ long) PURE; -+ STDMETHOD(put_TVFormat)(THIS_ long) PURE; -+ STDMETHOD(put_VCRHorizontalLocking)(THIS_ long) PURE; - }; - #undef INTERFACE - #define INTERFACE IAMAudioInputMixer -@@ -1091,22 +1172,22 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,get_Bass)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,get_BassRange)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,get_Enable)(THIS_ BOOL*) PURE; -- STDMETHOD_(HRESULT,get_Loudness)(THIS_ BOOL*) PURE; -- STDMETHOD_(HRESULT,get_MixLevel)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,get_Mono)(THIS_ BOOL*) PURE; -- STDMETHOD_(HRESULT,get_Pan)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,get_Treble)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,get_TrebleRange)(THIS_ double*) PURE; -- STDMETHOD_(HRESULT,put_Bass)(THIS_ double) PURE; -- STDMETHOD_(HRESULT,put_Enable)(THIS_ BOOL) PURE; -- STDMETHOD_(HRESULT,put_Loudness)(THIS_ BOOL) PURE; -- STDMETHOD_(HRESULT,put_MixLevel)(THIS_ double) PURE; -- STDMETHOD_(HRESULT,put_Mono)(THIS_ BOOL) PURE; -- STDMETHOD_(HRESULT,put_Pan)(THIS_ double) PURE; -- STDMETHOD_(HRESULT,put_Treble)(THIS_ double) PURE; -+ STDMETHOD(get_Bass)(THIS_ double*) PURE; -+ STDMETHOD(get_BassRange)(THIS_ double*) PURE; -+ STDMETHOD(get_Enable)(THIS_ BOOL*) PURE; -+ STDMETHOD(get_Loudness)(THIS_ BOOL*) PURE; -+ STDMETHOD(get_MixLevel)(THIS_ double*) PURE; -+ STDMETHOD(get_Mono)(THIS_ BOOL*) PURE; -+ STDMETHOD(get_Pan)(THIS_ double*) PURE; -+ STDMETHOD(get_Treble)(THIS_ double*) PURE; -+ STDMETHOD(get_TrebleRange)(THIS_ double*) PURE; -+ STDMETHOD(put_Bass)(THIS_ double) PURE; -+ STDMETHOD(put_Enable)(THIS_ BOOL) PURE; -+ STDMETHOD(put_Loudness)(THIS_ BOOL) PURE; -+ STDMETHOD(put_MixLevel)(THIS_ double) PURE; -+ STDMETHOD(put_Mono)(THIS_ BOOL) PURE; -+ STDMETHOD(put_Pan)(THIS_ double) PURE; -+ STDMETHOD(put_Treble)(THIS_ double) PURE; - }; - #undef INTERFACE - #define INTERFACE IAMAudioRendererStats -@@ -1115,7 +1196,7 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE; -+ STDMETHOD(GetStatParam)(THIS_ DWORD,DWORD*,DWORD*) PURE; - }; - #undef INTERFACE - #define INTERFACE IAMBufferNegotiation -@@ -1124,8 +1205,8 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE; -- STDMETHOD_(HRESULT,SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE; -+ STDMETHOD(GetAllocatorProperties)(THIS_ ALLOCATOR_PROPERTIES*) PURE; -+ STDMETHOD(SuggestAllocatorProperties)(THIS_ const ALLOCATOR_PROPERTIES*) PURE; - }; - #undef INTERFACE - #define INTERFACE IAMCameraControl -@@ -1134,9 +1215,9 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,Get)(THIS_ long,long*,long*) PURE; -- STDMETHOD_(HRESULT,GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE; -- STDMETHOD_(HRESULT,Set)(THIS_ long,long,long) PURE; -+ STDMETHOD(Get)(THIS_ long,long*,long*) PURE; -+ STDMETHOD(GetRange)(THIS_ long,long*,long*,long*,long*,long*) PURE; -+ STDMETHOD(Set)(THIS_ long,long,long) PURE; - }; - #undef INTERFACE - -@@ -1146,13 +1227,205 @@ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -- STDMETHOD_(HRESULT,KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE; -- STDMETHOD_(HRESULT,ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE; -- STDMETHOD_(HRESULT,ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE; -- STDMETHOD_(HRESULT,SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE; -+ STDMETHOD(KeyExchange)(THIS_ GUID*,BYTE**,DWORD*) PURE; -+ STDMETHOD(ProtectionCommand)(THIS_ const AMCOPPCommand*) PURE; -+ STDMETHOD(ProtectionStatus)(THIS_ const AMCOPPStatusInput*,AMCOPPStatusOutput*) PURE; -+ STDMETHOD(SessionSequenceStart)(THIS_ const AMCOPPSignature*) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IFilterGraph -+DECLARE_INTERFACE_(IFilterGraph ,IUnknown) -+{ -+ STDMETHOD(AddFilter)(THIS_ IBaseFilter *, LPCWSTR) PURE; -+ STDMETHOD(RemoveFilter)(THIS_ IBaseFilter *) PURE; -+ STDMETHOD(EnumFilters)(THIS_ IEnumFilters **) PURE; -+ STDMETHOD(FindFilterByName)(THIS_ LPCWSTR, IBaseFilter **) PURE; -+ STDMETHOD(ConnectDirect)(THIS_ IPin *, IPin *, const AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(Reconnect)(THIS_ IPin *) PURE; -+ STDMETHOD(Disconnect)(THIS_ IPin *) PURE; -+ STDMETHOD(SetDefaultSyncSource)(THIS) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IGraphBuilder -+DECLARE_INTERFACE_(IGraphBuilder ,IFilterGraph) -+{ -+ STDMETHOD(Connect)(THIS_ IPin *, IPin *) PURE; -+ STDMETHOD(Render)(THIS_ IPin *) PURE; -+ STDMETHOD(RenderFile)(THIS_ LPCWSTR, LPCWSTR) PURE; -+ STDMETHOD(AddSourceFilter)(THIS_ LPCWSTR, LPCWSTR, IBaseFilter **) PURE; -+ STDMETHOD(SetLogFile)(THIS_ DWORD_PTR) PURE; -+ STDMETHOD(Abort)(THIS) PURE; -+ STDMETHOD(ShouldOperationContinue)(THIS) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IReferenceClock -+DECLARE_INTERFACE_(IReferenceClock, IUnknown) -+{ -+ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *) PURE; -+ STDMETHOD(AdviseTime)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HEVENT, DWORD_PTR *) PURE; -+ STDMETHOD(AdvisePeriodic)(THIS_ REFERENCE_TIME, REFERENCE_TIME, HSEMAPHORE, DWORD_PTR *) PURE; -+ STDMETHOD(Unadvise)(THIS_ DWORD_PTR) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IEnumFilters -+DECLARE_INTERFACE_(IEnumFilters, IUnknown) -+{ -+ STDMETHOD(Next)(THIS_ ULONG, IBaseFilter **, ULONG *) PURE; -+ STDMETHOD(Skip)(THIS_ ULONG) PURE; -+ STDMETHOD(Reset)(THIS) PURE; -+ STDMETHOD(Clone)(THIS_ IEnumFilters **) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IEnumMediaTypes -+DECLARE_INTERFACE_(IEnumMediaTypes, IUnknown) -+{ -+ STDMETHOD(Next)(THIS_ ULONG, AM_MEDIA_TYPE **, ULONG *) PURE; -+ STDMETHOD(Skip)(THIS_ ULONG) PURE; -+ STDMETHOD(Reset)(THIS) PURE; -+ STDMETHOD(Clone)(THIS_ IEnumMediaTypes **) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IEnumPins -+DECLARE_INTERFACE_(IEnumPins, IUnknown) -+{ -+ STDMETHOD(Next)(THIS_ ULONG, IPin **, ULONG *) PURE; -+ STDMETHOD(Skip)(THIS_ ULONG) PURE; -+ STDMETHOD(Reset)(THIS) PURE; -+ STDMETHOD(Clone)(THIS_ IEnumPins **) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IPin -+DECLARE_INTERFACE_(IPin, IUnknown) -+{ -+ STDMETHOD(Connect)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(ReceiveConnection)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(Disconnect)(THIS) PURE; -+ STDMETHOD(ConnectedTo)(THIS_ IPin **) PURE; -+ STDMETHOD(ConnectionMediaType)(THIS_ AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(QueryPinInfo)(THIS_ PIN_INFO *) PURE; -+ STDMETHOD(QueryDirection)(THIS_ PIN_DIRECTION *) PURE; -+ STDMETHOD(QueryId)(THIS_ LPWSTR *) PURE; -+ STDMETHOD(QueryAccept)(THIS_ const AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(EnumMediaTypes)(THIS_ IEnumMediaTypes **) PURE; -+ STDMETHOD(QueryInternalConnections)(THIS_ IPin **, ULONG *) PURE; -+ STDMETHOD(EndOfStream)(THIS) PURE; -+ STDMETHOD(BeginFlush)(THIS) PURE; -+ STDMETHOD(EndFlush)(THIS) PURE; -+ STDMETHOD(NewSegment)(THIS_ REFERENCE_TIME, REFERENCE_TIME, double) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaFilter -+DECLARE_INTERFACE_(IMediaFilter, IPersist) -+{ -+ STDMETHOD(Stop)(THIS) PURE; -+ STDMETHOD(Pause)(THIS) PURE; -+ STDMETHOD(Run)(THIS_ REFERENCE_TIME) PURE; -+ STDMETHOD(GetState)(THIS_ DWORD, FILTER_STATE *) PURE; -+ STDMETHOD(SetSyncSource)(THIS_ IReferenceClock *) PURE; -+ STDMETHOD(GetSyncSource)(THIS_ IReferenceClock **) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IBaseFilter -+DECLARE_INTERFACE_(IBaseFilter, IMediaFilter) -+{ -+ STDMETHOD(EnumPins)(THIS_ IEnumPins **) PURE; -+ STDMETHOD(FindPin)(THIS_ LPCWSTR, IPin **) PURE; -+ STDMETHOD(QueryFilterInfo)(THIS_ FILTER_INFO *) PURE; -+ STDMETHOD(JoinFilterGraph)(THIS_ IFilterGraph *, LPCWSTR) PURE; -+ STDMETHOD(QueryVendorInfo)(THIS_ LPWSTR *) PURE; - }; - #undef INTERFACE -+#define INTERFACE IMediaSeeking -+DECLARE_INTERFACE_(IMediaSeeking, IUnknown) -+{ -+ STDMETHOD(GetCapabilities)(THIS_ DWORD *) PURE; -+ STDMETHOD(CheckCapabilities)(THIS_ DWORD *) PURE; -+ STDMETHOD(IsFormatSupported)(THIS_ const GUID *) PURE; -+ STDMETHOD(QueryPreferredFormat)(THIS_ GUID *) PURE; -+ STDMETHOD(GetTimeFormat)(THIS_ GUID *) PURE; -+ STDMETHOD(IsUsingTimeFormat)(THIS_ const GUID *) PURE; -+ STDMETHOD(SetTimeFormat)(THIS_ const GUID *) PURE; -+ STDMETHOD(GetDuration)(THIS_ LONGLONG *) PURE; -+ STDMETHOD(GetStopPosition)(THIS_ LONGLONG *) PURE; -+ STDMETHOD(GetCurrentPosition)(THIS_ LONGLONG *) PURE; -+ STDMETHOD(ConvertTimeFormat)(THIS_ LONGLONG *, const GUID *, LONGLONG, const GUID *) PURE; -+ STDMETHOD(SetPositions)(THIS_ LONGLONG *, DWORD, LONGLONG *, DWORD) PURE; -+ STDMETHOD(GetPositions)(THIS_ LONGLONG *,LONGLONG *) PURE; -+ STDMETHOD(GetAvailable)(THIS_ LONGLONG *, LONGLONG *) PURE; -+ STDMETHOD(SetRate)(THIS_ double) PURE; -+ STDMETHOD(GetRate)(THIS_ double *) PURE; -+ STDMETHOD(GetPreroll)(THIS_ LONGLONG *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE ICreateDevEnum -+DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) -+{ -+ STDMETHOD(CreateClassEnumerator)(THIS_ REFCLSID, IEnumMoniker **, DWORD) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaSample -+DECLARE_INTERFACE_(IMediaSample, IUnknown) -+{ -+ STDMETHOD(GetPointer)(THIS_ BYTE **) PURE; -+ STDMETHOD_(long, GetSize)(THIS) PURE; -+ STDMETHOD(GetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE; -+ STDMETHOD(SetTime)(THIS_ REFERENCE_TIME *, REFERENCE_TIME *) PURE; -+ STDMETHOD(IsSyncPoint)(THIS) PURE; -+ STDMETHOD(SetSyncPoint)(THIS_ BOOL) PURE; -+ STDMETHOD(IsPreroll)(THIS) PURE; -+ STDMETHOD(SetPreroll)(THIS_ BOOL) PURE; -+ STDMETHOD_(long, GetActualDataLength)(THIS) PURE; -+ STDMETHOD(SetActualDataLength)(THIS_ long) PURE; -+ STDMETHOD(GetMediaType)(THIS_ AM_MEDIA_TYPE **) PURE; -+ STDMETHOD(SetMediaType)(THIS_ AM_MEDIA_TYPE *) PURE; -+ STDMETHOD(IsDiscontinuity)(THIS) PURE; -+ STDMETHOD(SetDiscontinuity)(THIS_ BOOL) PURE; -+ STDMETHOD(GetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE; -+ STDMETHOD(SetMediaTime)(THIS_ LONGLONG *, LONGLONG *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMemAllocator -+DECLARE_INTERFACE_(IMemAllocator, IUnknown) -+{ -+ STDMETHOD(SetProperties)(THIS_ ALLOCATOR_PROPERTIES *, ALLOCATOR_PROPERTIES *) PURE; -+ STDMETHOD(GetProperties)(THIS_ ALLOCATOR_PROPERTIES *) PURE; -+ STDMETHOD(Commit)(THIS) PURE; -+ STDMETHOD(Decommit)(THIS) PURE; -+ STDMETHOD(GetBuffer)(THIS_ IMediaSample **, REFERENCE_TIME *, REFERENCE_TIME *, DWORD) PURE; -+ STDMETHOD(ReleaseBuffer)(THIS_ IMediaSample *) PURE; - -+}; -+#undef INTERFACE -+#define INTERFACE IAsyncReader -+DECLARE_INTERFACE_(IAsyncReader, IUnknown) -+{ -+ STDMETHOD(RequestAllocator)(THIS_ IMemAllocator *, ALLOCATOR_PROPERTIES *, IMemAllocator **) PURE; -+ STDMETHOD(Request)(THIS_ IMediaSample *, DWORD_PTR) PURE; -+ STDMETHOD(WaitForNext)(THIS_ DWORD, IMediaSample **, DWORD_PTR *) PURE; -+ STDMETHOD(SyncReadAligned)(THIS_ IMediaSample *) PURE; -+ STDMETHOD(SyncRead)(THIS_ LONGLONG, LONG, BYTE *) PURE; -+ STDMETHOD(Length)(THIS_ LONGLONG *, LONGLONG *) PURE; -+ STDMETHOD(BeginFlush)(THIS) PURE; -+ STDMETHOD(EndFlush)(THIS) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMediaEventSink -+DECLARE_INTERFACE_(IMediaEventSink, IUnknown) -+{ -+ STDMETHOD(Notify)(THIS_ long, LONG_PTR, LONG_PTR) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IMemInputPin -+DECLARE_INTERFACE_(IMemInputPin, IUnknown) -+{ -+ STDMETHOD(GetAllocator)(THIS_ IMemAllocator **) PURE; -+ STDMETHOD(NotifyAllocator)(THIS_ IMemAllocator *, BOOL) PURE; -+ STDMETHOD(GetAllocatorRequirements)(THIS_ ALLOCATOR_PROPERTIES *) PURE; -+ STDMETHOD(Receive)(THIS_ IMediaSample *) PURE; -+ STDMETHOD(ReceiveMultiple)(THIS_ IMediaSample **, long, long *) PURE; -+ STDMETHOD(ReceiveCanBlock)(THIS) PURE; -+}; -+#undef INTERFACE - #ifdef __cplusplus - } - #endif -diff -ruN a/include/vmr9.h b/include/vmr9.h ---- a/include/vmr9.h 2008-12-06 03:32:11.000000000 +0100 -+++ b/include/vmr9.h 2010-04-12 17:12:52.000000000 +0200 -@@ -8,6 +8,10 @@ - extern "C" { - #endif - -+EXTERN_C const IID IID_IVMRFilterConfig9; -+EXTERN_C const IID IID_IVMRWindowlessControl9; -+EXTERN_C const IID IID_IVMRMixerControl9; -+ - /*--- DirectShow Reference - DirectShow Enumerated Types */ - typedef enum _VMR9_SampleFormat { - VMR9_SampleReserved = 1, -@@ -61,7 +65,7 @@ - MixerPref9_RenderTargetRGB = 0x00001000, - MixerPref9_RenderTargetYUV = 0x00002000, - MixerPref9_RenderTargetReserved = 0x000FC000, -- MixerPref9_RenderTargetMask = 0x000FF000 -+ MixerPref9_RenderTargetMask = 0x000FF000, - MixerPref9_DynamicSwitchToBOB = 0x00100000, - MixerPref9_DynamicDecimateBy2 = 0x00200000, - MixerPref9_DynamicReserved = 0x00C00000, -@@ -128,7 +132,7 @@ - HMONITOR hMon; - DWORD dwFlags; - wchar_t szDevice[32]; -- wchar_t szDescription[512] -+ wchar_t szDescription[512]; - LARGE_INTEGER liDriverVersion; - DWORD dwVendorId; - DWORD dwDeviceId; -@@ -181,7 +185,6 @@ - VMR9Frequency InputSampleFreq; - VMR9Frequency OutputFrameFreq; - } VMR9VideoDesc; --/********** - typedef struct VMR9VideoStreamInfo{ - IDirect3DSurface9 *pddsVideoSurface; - DWORD dwWidth; -@@ -203,8 +206,64 @@ - COLORREF clrSrcKey; - DWORD dwFilterMode; - }; --**********/ -- -+#define INTERFACE IVMRImageCompositor9 -+DECLARE_INTERFACE_(IVMRImageCompositor9, IUnknown) -+{ -+ STDMETHOD(InitCompositionDevice)(THIS_ IUnknown *) PURE; -+ STDMETHOD(TermCompositionDevice)(THIS_ IUnknown *) PURE; -+ STDMETHOD(SetStreamMediaType)(THIS_ DWORD, AM_MEDIA_TYPE *, BOOL) PURE; -+ STDMETHOD(CompositeImage)(THIS_ IUnknown *, IDirect3DSurface9 *, AM_MEDIA_TYPE *, -+ REFERENCE_TIME, REFERENCE_TIME, D3DCOLOR, VMR9VideoStreamInfo *, UINT) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IVMRFilterConfig9 -+DECLARE_INTERFACE_(IVMRFilterConfig9, IUnknown) -+{ -+ STDMETHOD(SetImageCompositor)(THIS_ IVMRImageCompositor9 *) PURE; -+ STDMETHOD(SetNumberOfStreams)(THIS_ DWORD) PURE; -+ STDMETHOD(GetNumberOfStreams)(THIS_ DWORD *) PURE; -+ STDMETHOD(SetRenderingPrefs)(THIS_ DWORD) PURE; -+ STDMETHOD(GetRenderingPrefs)(THIS_ DWORD *) PURE; -+ STDMETHOD(SetRenderingMode)(THIS_ DWORD) PURE; -+ STDMETHOD(GetRenderingMode)(THIS_ DWORD *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IVMRWindowlessControl9 -+DECLARE_INTERFACE_(IVMRWindowlessControl9, IUnknown) -+{ -+ STDMETHOD(GetNativeVideoSize)(THIS_ LONG *, LONG *, LONG *, LONG *) PURE; -+ STDMETHOD(GetMinIdealVideoSize)(THIS_ LONG *, LONG *) PURE; -+ STDMETHOD(GetMaxIdealVideoSize)(THIS_ LONG *, LONG *) PURE; -+ STDMETHOD(SetVideoPosition)(THIS_ const LPRECT, const LPRECT) PURE; -+ STDMETHOD(GetVideoPosition)(THIS_ LPRECT, LPRECT) PURE; -+ STDMETHOD(GetAspectRatioMode)(THIS_ DWORD *) PURE; -+ STDMETHOD(SetAspectRatioMode)(THIS_ DWORD) PURE; -+ STDMETHOD(SetVideoClippingWindow)(THIS_ HWND) PURE; -+ STDMETHOD(RepaintVideo)(THIS_ HWND, HDC) PURE; -+ STDMETHOD(DisplayModeChanged)(THIS) PURE; -+ STDMETHOD(GetCurrentImage)(THIS_ BYTE **) PURE; -+ STDMETHOD(SetBorderColor)(THIS_ COLORREF) PURE; -+ STDMETHOD(GetBorderColor)(THIS_ COLORREF *) PURE; -+}; -+#undef INTERFACE -+#define INTERFACE IVMRMixerControl9 -+DECLARE_INTERFACE_(IVMRMixerControl9, IUnknown) -+{ -+ STDMETHOD(SetAlpha)(THIS_ DWORD, float) PURE; -+ STDMETHOD(GetAlpha)(THIS_ DWORD, float *) PURE; -+ STDMETHOD(SetZOrder)(THIS_ DWORD, DWORD) PURE; -+ STDMETHOD(GetZOrder)(THIS_ DWORD, DWORD *) PURE; -+ STDMETHOD(SetOutputRect)(THIS_ DWORD, const VMR9NormalizedRect *) PURE; -+ STDMETHOD(GetOutputRect)(THIS_ DWORD, VMR9NormalizedRect *) PURE; -+ STDMETHOD(SetBackgroundClr)(THIS_ COLORREF) PURE; -+ STDMETHOD(GetBackgroundClr)(THIS_ COLORREF *) PURE; -+ STDMETHOD(SetMixingPrefs)(THIS_ DWORD) PURE; -+ STDMETHOD(GetMixingPrefs)(THIS_ DWORD *) PURE; -+ STDMETHOD(SetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE; -+ STDMETHOD(GetProcAmpControl)(THIS_ DWORD, VMR9ProcAmpControl *) PURE; -+ STDMETHOD(GetProcAmpControlRange)(THIS_ DWORD, VMR9ProcAmpControlRange *) PURE; -+}; -+#undef INTERFACE - #ifdef __cplusplus - } - #endif