generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hard define the GUID for AudioEndpoint to avoid conflicts during compile.

Browse Source 
BUG=3996
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36649004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8026 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
decurtis@webrtc.org 2015-01-08 19:18:01 +00:00
parent 758d6d431e
commit 2ead571fb6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
talk/media/devices/win32devicemanager.cc
View File

@ -32,12 +32,22 @@
#include <strmif.h> // must come before ks.h
#include <ks.h>
#include <ksmedia.h>
#define INITGUID // For PKEY_AudioEndpoint_GUID
#include <mmdeviceapi.h>
#include <mmsystem.h>
#include <functiondiscoverykeys_devpkey.h>
#include <uuids.h>
// PKEY_AudioEndpoint_GUID isn't included in uuid.lib and we don't want
// to define INITGUID in order to define all the uuids in this object file
// as it will conflict with uuid.lib (multiply defined symbols).
// So our workaround is to define this one missing symbol here manually.
// See: https://code.google.com/p/webrtc/issues/detail?id=3996
EXTERN_C const PROPERTYKEY PKEY_AudioEndpoint_GUID = { {
0x1da5d803, 0xd492, 0x4edd, {
0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e
} }, 4
};
#include "webrtc/base/logging.h"
#include "webrtc/base/stringutils.h"
#include "webrtc/base/thread.h"