[vlc-commits] DShow: GUID fixes

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb 22 00:54:28 2011 +0100| [01067be9eccd091ddbc9bb0058ccb71f766e6392] | committer: Jean-Baptiste Kempf

DShow: GUID fixes

Notably export GUID in the header

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01067be9eccd091ddbc9bb0058ccb71f766e6392
---

 modules/access/dshow/common.h   |    6 ++++++
 modules/access/dshow/dshow.cpp  |    1 +
 modules/access/dshow/filter.cpp |    7 +------
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/access/dshow/common.h b/modules/access/dshow/common.h
index 0575f19..d31d126 100644
--- a/modules/access/dshow/common.h
+++ b/modules/access/dshow/common.h
@@ -106,6 +106,12 @@ struct access_sys_t
  * DirectShow GUIDs.
  *****************************************************************************/
 static const GUID PROPSETID_TUNER = {0x6a2e0605, 0x28e4, 0x11d0, {0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56}};
+const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}};
+const GUID IID_IAMTVAudio      = {0x83EC1C30, 0x23D1, 0x11d1, {0x99, 0xE6, 0x00, 0xA0, 0xC9, 0x56, 0x02, 0x66}};
+const GUID IID_IAMStreamConfig = {0xC6E13340, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}};
+const GUID IID_IAMCrossbar     = {0xC6E13380, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}};
+const GUID IID_IAMTVTuner      = {0x211A8766, 0x03AC, 0x11d1, {0x8D, 0x13, 0x00, 0xAA, 0x00, 0xBD, 0x83, 0x39}};
+
 
 /****************************************************************************
  * The following should be in ks.h and ksmedia.h, but since they are not in
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index fb7b392..d78e1e4 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -45,6 +45,7 @@
 
 #include "common.h"
 #include "filter.h"
+const GUID IID_IAMStreamConfig = {0xC6E13340, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}};
 
 /*****************************************************************************
  * Access: local prototypes
diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index d895b4b..111f6ce 100644
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -72,7 +72,7 @@ extern const GUID IID_IMemInputPin;
 const GUID IID_IEnumPins    = {0x56a86892, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 const GUID IID_IEnumMediaTypes = {0x89c31040, 0x846b, 0x11ce, {0x97,0xd3, 0x00,0xaa,0x00,0x55,0x59,0x5a}};
 
-const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}};
+//const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}};
 
 //const GUID IID_ISpecifyPropertyPages = {0xb196b28b, 0xbab4, 0x101a, {0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07}};
 extern const GUID IID_ISpecifyPropertyPages;
@@ -85,11 +85,6 @@ const GUID IID_IGraphBuilder          = {0x56a868a9, 0x0ad4, 0x11ce, {0xb0, 0x3a
 
 const GUID IID_ICaptureGraphBuilder2  = {0x93E5A4E0, 0x2D50, 0x11d2, {0xAB, 0xFA, 0x00, 0xA0, 0xC9, 0xC6, 0xE3, 0x8D}};
 
-const GUID IID_IAMTVAudio      = {0x83EC1C30, 0x23D1, 0x11d1, {0x99, 0xE6, 0x00, 0xA0, 0xC9, 0x56, 0x02, 0x66}};
-const GUID IID_IAMStreamConfig = {0xC6E13340, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}};
-const GUID IID_IAMCrossbar     = {0xC6E13380, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}};
-const GUID IID_IAMTVTuner      = {0x211A8766, 0x03AC, 0x11d1, {0x8D, 0x13, 0x00, 0xAA, 0x00, 0xBD, 0x83, 0x39}};
-
 const GUID IID_IKsPropertySet  = {0x31EFAC30, 0x515C, 0x11d0, {0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93}};
 
 /* Video Format */