From 2c23ee07a93fdd660989a25c096461a1ab251aed Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Mon, 14 Feb 2011 13:02:24 +0000 Subject: [PATCH] - Fix compiling (not linking) svn path=/branches/cmake-bringup/; revision=50690 --- dll/directx/ksproxy/datatype.cpp | 1 + dll/directx/ksproxy/input_pin.cpp | 3 ++- dll/directx/ksproxy/interface.cpp | 2 ++ dll/directx/ksproxy/ksproxy.cpp | 3 ++- dll/directx/ksproxy/output_pin.cpp | 5 ++++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dll/directx/ksproxy/datatype.cpp b/dll/directx/ksproxy/datatype.cpp index 965e847b55b..dee247e081e 100644 --- a/dll/directx/ksproxy/datatype.cpp +++ b/dll/directx/ksproxy/datatype.cpp @@ -13,6 +13,7 @@ const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; #endif const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; class CKsDataTypeHandler : public IKsDataTypeHandler { diff --git a/dll/directx/ksproxy/input_pin.cpp b/dll/directx/ksproxy/input_pin.cpp index e56eacb938c..253e4416101 100644 --- a/dll/directx/ksproxy/input_pin.cpp +++ b/dll/directx/ksproxy/input_pin.cpp @@ -10,7 +10,8 @@ const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02}}; const GUID IID_IKsPinEx = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e}}; - +const GUID IID_IKsPin = {0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; +const GUID IID_IKsInterfaceHandler = {0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; #ifndef _MSC_VER diff --git a/dll/directx/ksproxy/interface.cpp b/dll/directx/ksproxy/interface.cpp index 7eb0fd284d5..67196fbe60f 100644 --- a/dll/directx/ksproxy/interface.cpp +++ b/dll/directx/ksproxy/interface.cpp @@ -10,6 +10,8 @@ const GUID IID_IKsObject = {0x423c13a2, 0x2070, 0x11d0, {0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; +extern const GUID IID_IKsInterfaceHandler; + class CKsInterfaceHandler : public IKsInterfaceHandler { public: diff --git a/dll/directx/ksproxy/ksproxy.cpp b/dll/directx/ksproxy/ksproxy.cpp index 7baa7e30496..545af53154d 100644 --- a/dll/directx/ksproxy/ksproxy.cpp +++ b/dll/directx/ksproxy/ksproxy.cpp @@ -16,12 +16,13 @@ const GUID CLSID_KsQualityForwarder = {0xe05592e4, 0xc0b5, 0x11d0, {0 #ifndef _MSC_VER -const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; const GUID KSPROPSETID_Pin = {0x8C134960, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSINTERFACESETID_Standard = {STATIC_KSINTERFACESETID_Standard}; const GUID CLSID_Proxy = {0x17CCA71B, 0xECD7, 0x11D0, {0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; #endif +const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; + static INTERFACE_TABLE InterfaceTable[] = { {&MEDIATYPE_Audio, CKsDataTypeHandler_Constructor}, diff --git a/dll/directx/ksproxy/output_pin.cpp b/dll/directx/ksproxy/output_pin.cpp index 2bf85c8a06b..c096ab4ea54 100644 --- a/dll/directx/ksproxy/output_pin.cpp +++ b/dll/directx/ksproxy/output_pin.cpp @@ -8,6 +8,9 @@ */ #include "precomp.h" +extern const GUID IID_IKsPin; +extern const GUID IID_IKsInterfaceHandler; + class COutputPin : public IPin, public IKsObject, public IKsPropertySet, @@ -1681,7 +1684,7 @@ COutputPin::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) if (GetSupportedSets(&pGuid, &NumGuids)) { // load all proxy plugins - if (FAILED(LoadProxyPlugins(pGuid, NumGuids))); + if (FAILED(LoadProxyPlugins(pGuid, NumGuids))) { #ifdef KSPROXY_TRACE OutputDebugStringW(L"COutputPin::Connect LoadProxyPlugins failed\n");