mxe/src/qtmultimedia-1-cherrypicks....

46 lines
1.5 KiB
Diff

This file is part of MXE.
See index.html for further information.
From af295c0f78cfc8e54601048d5da66f6e81f6661e Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 13 Dec 2012 20:23:48 +0100
Subject: [PATCH] remove duplicate defs (mxe-specific)
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 3c66d05..10e8037 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT;
#else
extern GUID CLSID_AudioInputDeviceCategory;
-extern GUID CLSID_AudioRendererCategory;
-extern GUID IID_ICreateDevEnum;
-extern GUID CLSID_SystemDeviceEnum;
+//extern GUID CLSID_AudioRendererCategory;
+//extern GUID IID_ICreateDevEnum;
+//extern GUID CLSID_SystemDeviceEnum;
#ifndef __ICreateDevEnum_INTERFACE_DEFINED__
#define __ICreateDevEnum_INTERFACE_DEFINED__
-DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
-{
- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass,
- IEnumMoniker **ppEnumMoniker,
- DWORD dwFlags) PURE;
-};
+//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
+//{
+// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass,
+// IEnumMoniker **ppEnumMoniker,
+// DWORD dwFlags) PURE;
+//};
#endif // __ICreateDevEnum_INTERFACE_DEFINED__
--
1.7.10.4