me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wasapi:

Browse source 
- fixed configure.in to compile WASAPI module under MSYS
- fixed include name cases for case-sensitive build environments
- defined LPCGUID for some MinGW compilers which are missing it
- fixed strict-aliasing rules break on line of getting device EndpointFormFactor in case '-Wstrict-aliasing' is specified or corresponding GCC optimization flag is used
This commit is contained in:
dmitrykos 2010-03-09 12:29:36 +00:00
commit 50c880c015
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/hostapi/wasapi/pa_win_wasapi.c
View file

@ -51,8 +51,8 @@
#if _MSC_VER >= 1400
#include <Avrt.h>
#define COBJMACROS
#include <audioclient.h>
#include <Endpointvolume.h>
#include <Audioclient.h>
#include <endpointvolume.h>
#define INITGUID //<< avoid additional linkage of static libs, uneeded code will be optimized out
#include <mmdeviceapi.h>
#include <functiondiscoverykeys.h>
@ -84,6 +84,11 @@
#include <rpcsal.h>
#include <sal.h>
#ifndef __LPCGUID_DEFINED__
#define __LPCGUID_DEFINED__
typedef const GUID *LPCGUID;
#endif
#ifndef PROPERTYKEY_DEFINED
#define PROPERTYKEY_DEFINED
typedef struct _tagpropertykey
@ -234,9 +239,9 @@
#include <propkeydef.h>
#define COBJMACROS
#define INITGUID
#include <audioclient.h>
#include <Audioclient.h>
#include <mmdeviceapi.h>
#include <Endpointvolume.h>
#include <endpointvolume.h>
#include <functiondiscoverykeys.h>
#undef INITGUID
@ -1030,9 +1035,12 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
IF_FAILED_JUMP(hResult, error);
// set
#if defined(DUMMYUNIONNAME) && defined(NONAMELESSUNION)
paWasapi->devInfo[i].formFactor = (EndpointFormFactor)(*((UINT *)(((WORD *)&value.wReserved3)+1)));
// avoid breaking strict-aliasing rules in such line: (EndpointFormFactor)(*((UINT *)(((WORD *)&value.wReserved3)+1)));
UINT v;
memcpy(&v, (((WORD *)&value.wReserved3)+1), sizeof(v));
paWasapi->devInfo[i].formFactor = (EndpointFormFactor)v;
#else
paWasapi->devInfo[i].formFactor = (EndpointFormFactor)value.uintVal;
paWasapi->devInfo[i].formFactor = (EndpointFormFactor)value.uintVal;
#endif
PA_DEBUG(("WASAPI: device[%s] form-factor: %d\n", deviceInfo->name, paWasapi->devInfo[i].formFactor));
// cleanup