diff options
79 files changed, 282 insertions, 277 deletions
diff --git a/include/IBitRateInfo.h b/include/IBitRateInfo.h index d1eb116cd..63c7a1c26 100644 --- a/include/IBitRateInfo.h +++ b/include/IBitRateInfo.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("EB2CD9E6-BA08-4acb-AA0F-3D8D0DD521CA")]
-interface IBitRateInfo : public IUnknown
+interface __declspec(uuid("EB2CD9E6-BA08-4acb-AA0F-3D8D0DD521CA"))
+IBitRateInfo : public IUnknown
{
STDMETHOD_(DWORD, GetCurrentBitRate) () = 0;
STDMETHOD_(DWORD, GetAverageBitRate) () = 0;
diff --git a/include/IBufferInfo.h b/include/IBufferInfo.h index da72c1cca..b13f67a51 100644 --- a/include/IBufferInfo.h +++ b/include/IBufferInfo.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("46070104-1318-4A82-8822-E99AB7CD15C1")]
-interface IBufferInfo : public IUnknown
+interface __declspec(uuid("46070104-1318-4A82-8822-E99AB7CD15C1"))
+IBufferInfo : public IUnknown
{
STDMETHOD_(int, GetCount()) = 0;
STDMETHOD(GetStatus(int i, int& samples, int& size)) = 0;
diff --git a/include/IChapterInfo.h b/include/IChapterInfo.h index 3cd126116..4550a965e 100644 --- a/include/IChapterInfo.h +++ b/include/IChapterInfo.h @@ -44,8 +44,8 @@ struct ChapterElement2 : ChapterElement { };
#pragma pack(pop)
-[uuid("8E128709-3DC8-4e49-B632-380FCF496B6D")]
-interface IChapterInfo : public IUnknown
+interface __declspec(uuid("8E128709-3DC8-4e49-B632-380FCF496B6D"))
+IChapterInfo : public IUnknown
{
#define CHAPTER_BAD_ID 0xFFFFFFFF
#define CHAPTER_ROOT_ID 0
diff --git a/include/IFilterVersion.h b/include/IFilterVersion.h index 76d3df43a..c399a1fc9 100644 --- a/include/IFilterVersion.h +++ b/include/IFilterVersion.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("A0DD28E1-61C0-4539-A7E6-14544AFF092E")]
-interface IFilterVersion : public IUnknown
+interface __declspec(uuid("A0DD28E1-61C0-4539-A7E6-14544AFF092E"))
+IFilterVersion : public IUnknown
{
STDMETHOD_(DWORD, GetFilterVersion) () = 0;
};
\ No newline at end of file diff --git a/include/IKeyFrameInfo.h b/include/IKeyFrameInfo.h index fa40922f5..f17e8b485 100644 --- a/include/IKeyFrameInfo.h +++ b/include/IKeyFrameInfo.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("01A5BBD3-FE71-487C-A2EC-F585918A8724")]
-interface IKeyFrameInfo : public IUnknown
+interface __declspec(uuid("01A5BBD3-FE71-487C-A2EC-F585918A8724"))
+IKeyFrameInfo : public IUnknown
{
STDMETHOD (GetKeyFrameCount) (UINT& nKFs) = 0; // returns S_FALSE when every frame is a keyframe
STDMETHOD (GetKeyFrames) (const GUID* pFormat, REFERENCE_TIME* pKFs, UINT& nKFs /* in, out*/) = 0;
diff --git a/include/ITrackInfo.h b/include/ITrackInfo.h index 59310d032..77c90c042 100644 --- a/include/ITrackInfo.h +++ b/include/ITrackInfo.h @@ -42,8 +42,8 @@ struct TrackExtendedInfoAudio { #pragma pack(pop)
-[uuid("03E98D51-DDE7-43aa-B70C-42EF84A3A23D")]
-interface ITrackInfo : public IUnknown
+interface __declspec(uuid("03E98D51-DDE7-43aa-B70C-42EF84A3A23D"))
+ITrackInfo : public IUnknown
{
STDMETHOD_(UINT, GetTrackCount) () = 0;
diff --git a/src/DSUtil/DSMPropertyBag.h b/src/DSUtil/DSMPropertyBag.h index 0eeb11751..b13172379 100644 --- a/src/DSUtil/DSMPropertyBag.h +++ b/src/DSUtil/DSMPropertyBag.h @@ -4,8 +4,8 @@ // IDSMPropertyBag
-[uuid("232FD5D2-4954-41E7-BF9B-09E1257B1A95")]
-interface IDSMPropertyBag : public IPropertyBag2
+interface __declspec(uuid("232FD5D2-4954-41E7-BF9B-09E1257B1A95"))
+IDSMPropertyBag : public IPropertyBag2
{
STDMETHOD(SetProperty) (LPCWSTR key, LPCWSTR value) = 0;
STDMETHOD(SetProperty) (LPCWSTR key, VARIANT* var) = 0;
@@ -47,8 +47,8 @@ public: // IDSMResourceBag
-[uuid("EBAFBCBE-BDE0-489A-9789-05D5692E3A93")]
-interface IDSMResourceBag : public IUnknown
+interface __declspec(uuid("EBAFBCBE-BDE0-489A-9789-05D5692E3A93"))
+IDSMResourceBag : public IUnknown
{
STDMETHOD_(DWORD, ResGetCount) () = 0;
STDMETHOD(ResGet) (DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag) = 0;
@@ -97,8 +97,8 @@ public: // IDSMChapterBag
-[uuid("2D0EBE73-BA82-4E90-859B-C7C48ED3650F")]
-interface IDSMChapterBag : public IUnknown
+interface __declspec(uuid("2D0EBE73-BA82-4E90-859B-C7C48ED3650F"))
+IDSMChapterBag : public IUnknown
{
STDMETHOD_(DWORD, ChapGetCount) () = 0;
STDMETHOD(ChapGet) (DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName) = 0;
diff --git a/src/DSUtil/NullRenderers.h b/src/DSUtil/NullRenderers.h index bf3581f42..0552508f3 100644 --- a/src/DSUtil/NullRenderers.h +++ b/src/DSUtil/NullRenderers.h @@ -33,8 +33,8 @@ public: CNullRenderer(REFCLSID clsid, TCHAR* pName, LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("579883A0-4E2D-481F-9436-467AAFAB7DE8")]
-class CNullVideoRenderer : public CNullRenderer
+class __declspec(uuid("579883A0-4E2D-481F-9436-467AAFAB7DE8"))
+CNullVideoRenderer : public CNullRenderer
{
protected:
HRESULT CheckMediaType(const CMediaType* pmt);
@@ -43,8 +43,8 @@ public: CNullVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("DD9ED57D-6ABF-42E8-89A2-11D04798DC58")]
-class CNullUVideoRenderer : public CNullRenderer
+class __declspec(uuid("DD9ED57D-6ABF-42E8-89A2-11D04798DC58"))
+CNullUVideoRenderer : public CNullRenderer
{
protected:
HRESULT CheckMediaType(const CMediaType* pmt);
@@ -54,8 +54,8 @@ public: virtual HRESULT DoRenderSample(IMediaSample* pSample);
};
-[uuid("0C38BDFD-8C17-4E00-A344-F89397D3E22A")]
-class CNullAudioRenderer : public CNullRenderer
+class __declspec(uuid("0C38BDFD-8C17-4E00-A344-F89397D3E22A"))
+CNullAudioRenderer : public CNullRenderer
{
protected:
HRESULT CheckMediaType(const CMediaType* pmt);
@@ -64,8 +64,8 @@ public: CNullAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("64A45125-7343-4772-9DA4-179FAC9D462C")]
-class CNullUAudioRenderer : public CNullRenderer
+class __declspec(uuid("64A45125-7343-4772-9DA4-179FAC9D462C"))
+CNullUAudioRenderer : public CNullRenderer
{
protected:
HRESULT CheckMediaType(const CMediaType* pmt);
@@ -74,8 +74,8 @@ public: CNullUAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC")]
-class CNullTextRenderer : public CBaseFilter, public CCritSec
+class __declspec(uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC"))
+CNullTextRenderer : public CBaseFilter, public CCritSec
{
class CTextInputPin : public CBaseInputPin
{
diff --git a/src/SubPic/DX9SubPic.h b/src/SubPic/DX9SubPic.h index ad53d3fd2..5c077eafc 100644 --- a/src/SubPic/DX9SubPic.h +++ b/src/SubPic/DX9SubPic.h @@ -113,8 +113,8 @@ public: STDMETHODIMP SetMaxTextureSize(SIZE MaxTextureSize);
};
-[uuid("CD6D2AA5-20D3-4ebe-A8A9-34D3B00CC253")]
-interface ISubRenderCallback : public IUnknown
+interface __declspec(uuid("CD6D2AA5-20D3-4ebe-A8A9-34D3B00CC253"))
+ISubRenderCallback : public IUnknown
{
// NULL means release current device, textures and other resources
STDMETHOD(SetDevice)(IDirect3DDevice9 *dev) = 0;
@@ -126,8 +126,8 @@ interface ISubRenderCallback : public IUnknown int width, int height) = 0;
};
-[uuid("E602585E-C05A-4828-AC69-AF92997F2E0C")]
-interface ISubRenderCallback2 : public ISubRenderCallback
+interface __declspec(uuid("E602585E-C05A-4828-AC69-AF92997F2E0C"))
+ISubRenderCallback2 : public ISubRenderCallback
{
STDMETHOD(RenderEx)(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop,
REFERENCE_TIME AvgTimePerFrame,
@@ -135,8 +135,8 @@ interface ISubRenderCallback2 : public ISubRenderCallback int width, int height) = 0;
};
-[uuid("9CC7F9F7-3ED1-493c-AF65-527EA1D9947F")]
-interface ISubRender : public IUnknown
+interface __declspec(uuid("9CC7F9F7-3ED1-493c-AF65-527EA1D9947F"))
+ISubRender : public IUnknown
{
STDMETHOD(SetCallback)(ISubRenderCallback *cb) = 0;
};
diff --git a/src/SubPic/ISubPic.h b/src/SubPic/ISubPic.h index 67aa89825..92699b8ab 100644 --- a/src/SubPic/ISubPic.h +++ b/src/SubPic/ISubPic.h @@ -43,8 +43,8 @@ struct SubPicDesc // ISubPic
//
-[uuid("449E11F3-52D1-4a27-AA61-E2733AC92CC0")]
-interface ISubPic : public IUnknown
+interface __declspec(uuid("449E11F3-52D1-4a27-AA61-E2733AC92CC0"))
+ISubPic : public IUnknown
{
STDMETHOD_(void*, GetObject) () PURE;
@@ -160,8 +160,8 @@ public: // ISubPicAllocator
//
-[uuid("CF7C3C23-6392-4a42-9E72-0736CFF793CB")]
-interface ISubPicAllocator : public IUnknown
+interface __declspec(uuid("CF7C3C23-6392-4a42-9E72-0736CFF793CB"))
+ISubPicAllocator : public IUnknown
{
STDMETHOD (SetCurSize) (SIZE size /*[in]*/) PURE;
STDMETHOD (SetCurVidRect) (RECT curvidrect) PURE;
@@ -211,8 +211,8 @@ public: // ISubPicProvider
//
-[uuid("D62B9A1A-879A-42db-AB04-88AA8F243CFD")]
-interface ISubPicProvider : public IUnknown
+interface __declspec(uuid("D62B9A1A-879A-42db-AB04-88AA8F243CFD"))
+ISubPicProvider : public IUnknown
{
STDMETHOD (Lock) () PURE;
STDMETHOD (Unlock) () PURE;
@@ -260,8 +260,8 @@ public: // ISubPicQueue
//
-[uuid("C8334466-CD1E-4ad1-9D2D-8EE8519BD180")]
-interface ISubPicQueue : public IUnknown
+interface __declspec(uuid("C8334466-CD1E-4ad1-9D2D-8EE8519BD180"))
+ISubPicQueue : public IUnknown
{
STDMETHOD (SetSubPicProvider) (ISubPicProvider* pSubPicProvider /*[in]*/) PURE;
STDMETHOD (GetSubPicProvider) (ISubPicProvider** pSubPicProvider /*[out]*/) PURE;
@@ -374,8 +374,8 @@ public: // ISubPicAllocatorPresenter
//
-[uuid("CF75B1F0-535C-4074-8869-B15F177F944E")]
-interface ISubPicAllocatorPresenter : public IUnknown
+interface __declspec(uuid("CF75B1F0-535C-4074-8869-B15F177F944E"))
+ISubPicAllocatorPresenter : public IUnknown
{
STDMETHOD (CreateRenderer) (IUnknown** ppRenderer) PURE;
@@ -399,8 +399,8 @@ interface ISubPicAllocatorPresenter : public IUnknown STDMETHOD_(bool, ResetDevice) () PURE;
};
-[uuid("767AEBA8-A084-488a-89C8-F6B74E53A90F")]
-interface ISubPicAllocatorPresenter2 : public ISubPicAllocatorPresenter
+interface __declspec(uuid("767AEBA8-A084-488a-89C8-F6B74E53A90F"))
+ISubPicAllocatorPresenter2 : public ISubPicAllocatorPresenter
{
STDMETHOD (SetPixelShader2) (LPCSTR pSrcData, LPCSTR pTarget, bool bScreenSpace) PURE;
STDMETHOD_(SIZE, GetVisibleVideoSize) () PURE;
@@ -477,8 +477,8 @@ public: // ISubStream
//
-[uuid("DE11E2FB-02D3-45e4-A174-6B7CE2783BDB")]
-interface ISubStream : public IPersist
+interface __declspec(uuid("DE11E2FB-02D3-45e4-A174-6B7CE2783BDB"))
+ISubStream : public IPersist
{
STDMETHOD_(int, GetStreamCount) () PURE;
STDMETHOD (GetStreamInfo) (int i, WCHAR** ppName, LCID* pLCID) PURE;
diff --git a/src/apps/mplayerc/BaseGraph.h b/src/apps/mplayerc/BaseGraph.h index 79a1bd7e3..15d7f1638 100644 --- a/src/apps/mplayerc/BaseGraph.h +++ b/src/apps/mplayerc/BaseGraph.h @@ -39,8 +39,8 @@ protected: typedef enum {DirectShow = 0, RealMedia, QuickTime, ShockWave} engine_t;
-[uuid("B110CDE5-6331-4118-8AAF-A870D6F7E2E4")]
-interface IGraphEngine :
+interface __declspec(uuid("B110CDE5-6331-4118-8AAF-A870D6F7E2E4"))
+IGraphEngine :
public IUnknown
{
STDMETHOD_(engine_t, GetEngine) () = 0;
diff --git a/src/apps/mplayerc/DeinterlacerFilter.h b/src/apps/mplayerc/DeinterlacerFilter.h index 06576bd38..e0fdee2ad 100644 --- a/src/apps/mplayerc/DeinterlacerFilter.h +++ b/src/apps/mplayerc/DeinterlacerFilter.h @@ -23,8 +23,8 @@ #pragma once
-[uuid("96F3E0BE-1BA4-4E79-973D-191FE425C86B")]
-class CDeinterlacerFilter : public CTransformFilter
+class __declspec(uuid("96F3E0BE-1BA4-4E79-973D-191FE425C86B"))
+CDeinterlacerFilter : public CTransformFilter
{
protected:
HRESULT CDeinterlacerFilter::CheckConnect(PIN_DIRECTION dir, IPin* pPin);
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index ae2de3abb..f30da2c0a 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -292,8 +292,8 @@ HRESULT CFGFilterRegistry::Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, & return hr;
};
-[uuid("97f7c4d4-547b-4a5f-8332-536430ad2e4d")]
-interface IAMFilterData :
+interface __declspec(uuid("97f7c4d4-547b-4a5f-8332-536430ad2e4d"))
+IAMFilterData :
public IUnknown
{
STDMETHOD (ParseFilterData) (BYTE* rgbFilterData, ULONG cb, BYTE** prgbRegFilter2) PURE;
diff --git a/src/apps/mplayerc/IGraphBuilder2.h b/src/apps/mplayerc/IGraphBuilder2.h index 800255281..e4b0d9f48 100644 --- a/src/apps/mplayerc/IGraphBuilder2.h +++ b/src/apps/mplayerc/IGraphBuilder2.h @@ -23,8 +23,8 @@ #pragma once
-[uuid("165BE9D6-0929-4363-9BA3-580D735AA0F6")]
-interface IGraphBuilder2 :
+interface __declspec(uuid("165BE9D6-0929-4363-9BA3-580D735AA0F6"))
+IGraphBuilder2 :
public IFilterGraph2
{
STDMETHOD(IsPinDirection) (IPin* pPin, PIN_DIRECTION dir) = 0;
@@ -39,8 +39,8 @@ public IFilterGraph2 };
// private use only
-[uuid("43CDA93D-6A4E-4A07-BD3E-49D161073EE7")]
-interface IGraphBuilderDeadEnd :
+interface __declspec(uuid("43CDA93D-6A4E-4A07-BD3E-49D161073EE7"))
+IGraphBuilderDeadEnd :
public IUnknown
{
STDMETHOD_(size_t, GetCount)() = 0;
@@ -49,8 +49,8 @@ public IUnknown // private use only
-[uuid("43CDA93D-6A4E-4A07-BD3E-49D161073EE7")]
-interface IBDATuner :
+interface __declspec(uuid("43CDA93D-6A4E-4A07-BD3E-49D161073EE7"))
+IBDATuner :
public IUnknown
{
STDMETHOD(SetChannel) (int nChannelPrefNumber) = 0;
diff --git a/src/apps/mplayerc/TextPassThruFilter.h b/src/apps/mplayerc/TextPassThruFilter.h index 42fcdfc62..053a83a5d 100644 --- a/src/apps/mplayerc/TextPassThruFilter.h +++ b/src/apps/mplayerc/TextPassThruFilter.h @@ -25,8 +25,8 @@ class CTextPassThruInputPin;
-[uuid("E2BA9B7B-B65D-4804-ACB2-89C3E55511DB")]
-class CTextPassThruFilter : public CBaseFilter, public CCritSec
+class __declspec(uuid("E2BA9B7B-B65D-4804-ACB2-89C3E55511DB"))
+CTextPassThruFilter : public CBaseFilter, public CCritSec
{
friend class CTextPassThruInputPin;
friend class CTextPassThruOutputPin;
diff --git a/src/filters/InternalPropertyPage.h b/src/filters/InternalPropertyPage.h index 07247bd8a..af3292539 100644 --- a/src/filters/InternalPropertyPage.h +++ b/src/filters/InternalPropertyPage.h @@ -23,8 +23,8 @@ #include <atlcoll.h>
-[uuid("03481710-D73E-4674-839F-03EDE2D60ED8")]
-interface ISpecifyPropertyPages2 : public ISpecifyPropertyPages
+interface __declspec(uuid("03481710-D73E-4674-839F-03EDE2D60ED8"))
+ISpecifyPropertyPages2 : public ISpecifyPropertyPages
{
STDMETHOD (CreatePage) (const GUID& guid, IPropertyPage** ppPage) = 0;
};
diff --git a/src/filters/PinInfoWnd.h b/src/filters/PinInfoWnd.h index 6efa4c56b..b9768b8f4 100644 --- a/src/filters/PinInfoWnd.h +++ b/src/filters/PinInfoWnd.h @@ -24,8 +24,8 @@ #include "InternalPropertyPage.h"
#include <afxcmn.h>
-[uuid("A1EB391C-6089-4A87-9988-BE50872317D4")]
-class CPinInfoWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("A1EB391C-6089-4A87-9988-BE50872317D4"))
+CPinInfoWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IBaseFilter> m_pBF;
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h index 2b7f7095e..21765fded 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h +++ b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("EE6F2741-7DB4-4AAD-A3CB-545208EE4C0A")]
-interface IBaseMuxerRelatedPin : public IUnknown
+interface __declspec(uuid("EE6F2741-7DB4-4AAD-A3CB-545208EE4C0A"))
+IBaseMuxerRelatedPin : public IUnknown
{
STDMETHOD(SetRelatedPin) (CBasePin* pPin) = 0;
STDMETHOD_(CBasePin*, GetRelatedPin) () = 0;
diff --git a/src/filters/muxer/BaseMuxer/BitStream.h b/src/filters/muxer/BaseMuxer/BitStream.h index 26621660e..d3238b94a 100644 --- a/src/filters/muxer/BaseMuxer/BitStream.h +++ b/src/filters/muxer/BaseMuxer/BitStream.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("30AB78C7-5259-4594-AEFE-9C0FC2F08A5E")]
-interface IBitStream : public IUnknown
+interface __declspec(uuid("30AB78C7-5259-4594-AEFE-9C0FC2F08A5E"))
+IBitStream : public IUnknown
{
STDMETHOD_(UINT64, GetPos) () = 0;
STDMETHOD_(UINT64, Seek) (UINT64 pos) = 0; // it's a _stream_, please don't seek if you don't have to
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.h b/src/filters/muxer/DSMMuxer/DSMMuxer.h index 1d3269127..71fccc081 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.h +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.h @@ -24,8 +24,8 @@ #include "../BaseMuxer/BaseMuxer.h"
#include <dsm/dsm.h>
-[uuid("C6590B76-587E-4082-9125-680D0693A97B")]
-class CDSMMuxerFilter : public CBaseMuxerFilter
+class __declspec(uuid("C6590B76-587E-4082-9125-680D0693A97B"))
+CDSMMuxerFilter : public CBaseMuxerFilter
{
bool m_fAutoChap, m_fAutoRes;
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h index 68bcdd2e0..21f259901 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h @@ -83,15 +83,15 @@ public: STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
-[uuid("38E2D43D-915D-493C-B373-888DB16EE3DC")]
-interface IMatroskaMuxer : public IUnknown
+interface __declspec(uuid("38E2D43D-915D-493C-B373-888DB16EE3DC"))
+IMatroskaMuxer : public IUnknown
{
STDMETHOD (CorrectTimeOffset) (bool fNegative, bool fPositive) = 0;
// TODO: chapters
};
-[uuid("1E1299A2-9D42-4F12-8791-D79E376F4143")]
-class CMatroskaMuxerFilter
+class __declspec(uuid("1E1299A2-9D42-4F12-8791-D79E376F4143"))
+CMatroskaMuxerFilter
: public CBaseFilter
, public CCritSec
, public CAMThread
diff --git a/src/filters/muxer/WavDest/WavDest.h b/src/filters/muxer/WavDest/WavDest.h index 84b054d32..cd1054ca9 100644 --- a/src/filters/muxer/WavDest/WavDest.h +++ b/src/filters/muxer/WavDest/WavDest.h @@ -32,8 +32,8 @@ public: HRESULT CheckMediaType(const CMediaType* pmt);
};
-[uuid("8685214E-4D32-4058-BE04-D01104F00B0C")]
-class CWavDestFilter : public CTransformFilter
+class __declspec(uuid("8685214E-4D32-4058-BE04-D01104F00B0C"))
+CWavDestFilter : public CTransformFilter
{
public:
CWavDestFilter(LPUNKNOWN pUnk, HRESULT* pHr);
diff --git a/src/filters/parser/AviSplitter/AviSplitter.h b/src/filters/parser/AviSplitter/AviSplitter.h index f3e0c50cf..4ba8cdf35 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.h +++ b/src/filters/parser/AviSplitter/AviSplitter.h @@ -35,8 +35,8 @@ public: HRESULT CheckConnect(IPin* pPin);
};
-[uuid("9736D831-9D6C-4E72-B6E7-560EF9181001")]
-class CAviSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("9736D831-9D6C-4E72-B6E7-560EF9181001"))
+CAviSplitterFilter : public CBaseSplitterFilter
{
CAutoVectorPtr<DWORD> m_tFrame;
@@ -78,8 +78,8 @@ public: STDMETHODIMP GetKeyFrames(const GUID* pFormat, REFERENCE_TIME* pKFs, UINT& nKFs);
};
-[uuid("CEA8DEFF-0AF7-4DB9-9A38-FB3C3AEFC0DE")]
-class CAviSourceFilter : public CAviSplitterFilter
+class __declspec(uuid("CEA8DEFF-0AF7-4DB9-9A38-FB3C3AEFC0DE"))
+CAviSourceFilter : public CAviSplitterFilter
{
public:
CAviSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/BaseSplitter/AsyncReader.h b/src/filters/parser/BaseSplitter/AsyncReader.h index d26552f0e..466f95557 100644 --- a/src/filters/parser/BaseSplitter/AsyncReader.h +++ b/src/filters/parser/BaseSplitter/AsyncReader.h @@ -23,8 +23,8 @@ #include "MultiFiles.h"
-[uuid("6DDB4EE7-45A0-4459-A508-BD77B32C91B2")]
-interface ISyncReader : public IUnknown
+interface __declspec(uuid("6DDB4EE7-45A0-4459-A508-BD77B32C91B2"))
+ISyncReader : public IUnknown
{
STDMETHOD_(void, SetBreakEvent) (HANDLE hBreakEvent) = 0;
STDMETHOD_(bool, HasErrors) () = 0;
@@ -32,8 +32,8 @@ interface ISyncReader : public IUnknown STDMETHOD_(void, SetPTSOffset) (REFERENCE_TIME* rtPTSOffset) = 0;
};
-[uuid("7D55F67A-826E-40B9-8A7D-3DF0CBBD272D")]
-interface IFileHandle : public IUnknown
+interface __declspec(uuid("7D55F67A-826E-40B9-8A7D-3DF0CBBD272D"))
+IFileHandle : public IUnknown
{
STDMETHOD_(HANDLE, GetFileHandle)() = 0;
STDMETHOD_(LPCTSTR, GetFileName)() = 0;
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.h b/src/filters/parser/DSMSplitter/DSMSplitter.h index 77bc53cad..70343053e 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.h +++ b/src/filters/parser/DSMSplitter/DSMSplitter.h @@ -26,8 +26,8 @@ #include "DSMSplitterFile.h"
#include "../BaseSplitter/BaseSplitter.h"
-[uuid("0912B4DD-A30A-4568-B590-7179EBB420EC")]
-class CDSMSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("0912B4DD-A30A-4568-B590-7179EBB420EC"))
+CDSMSplitterFilter : public CBaseSplitterFilter
{
protected:
CAutoPtr<CDSMSplitterFile> m_pFile;
@@ -47,8 +47,8 @@ public: STDMETHODIMP_(HRESULT) GetKeyFrames(const GUID* pFormat, REFERENCE_TIME* pKFs, UINT& nKFs);
};
-[uuid("803E8280-F3CE-4201-982C-8CD8FB512004")]
-class CDSMSourceFilter : public CDSMSplitterFilter
+class __declspec(uuid("803E8280-F3CE-4201-982C-8CD8FB512004"))
+CDSMSourceFilter : public CDSMSplitterFilter
{
public:
CDSMSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/DiracSplitter/DiracSplitter.h b/src/filters/parser/DiracSplitter/DiracSplitter.h index 0ed5d14cb..e40d52627 100644 --- a/src/filters/parser/DiracSplitter/DiracSplitter.h +++ b/src/filters/parser/DiracSplitter/DiracSplitter.h @@ -24,8 +24,8 @@ #include "../BaseSplitter/BaseSplitter.h"
#include "DiracSplitterFile.h"
-[uuid("5899CFB9-948F-4869-A999-5544ECB38BA5")]
-class CDiracSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("5899CFB9-948F-4869-A999-5544ECB38BA5"))
+CDiracSplitterFilter : public CBaseSplitterFilter
{
protected:
CAutoPtr<CDiracSplitterFile> m_pFile;
@@ -42,15 +42,15 @@ public: STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
};
-[uuid("09E7F58E-71A1-419D-B0A0-E524AE1454A9")]
-class CDiracSourceFilter : public CDiracSplitterFilter
+class __declspec(uuid("09E7F58E-71A1-419D-B0A0-E524AE1454A9"))
+CDiracSourceFilter : public CDiracSplitterFilter
{
public:
CDiracSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("F78CF248-180E-4713-B107-B13F7B5C31E1")]
-class CDiracVideoDecoder : public CTransformFilter
+class __declspec(uuid("F78CF248-180E-4713-B107-B13F7B5C31E1"))
+CDiracVideoDecoder : public CTransformFilter
{
void* m_decoder; // dirac_decoder_t*
void InitDecoder(), FreeDecoder();
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.h b/src/filters/parser/FLVSplitter/FLVSplitter.h index 62ab89abc..4ccdb000b 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.h +++ b/src/filters/parser/FLVSplitter/FLVSplitter.h @@ -24,8 +24,8 @@ #include <atlcoll.h>
#include "../BaseSplitter/BaseSplitter.h"
-[uuid("47E792CF-0BBE-4F7A-859C-194B0768650A")]
-class CFLVSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("47E792CF-0BBE-4F7A-859C-194B0768650A"))
+CFLVSplitterFilter : public CBaseSplitterFilter
{
UINT32 m_DataOffset;
bool m_IgnorePrevSizes;
@@ -84,8 +84,8 @@ public: CFLVSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("C9ECE7B3-1D8E-41F5-9F24-B255DF16C087")]
-class CFLVSourceFilter : public CFLVSplitterFilter
+class __declspec(uuid("C9ECE7B3-1D8E-41F5-9F24-B255DF16C087"))
+CFLVSourceFilter : public CFLVSplitterFilter
{
public:
CFLVSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.h b/src/filters/parser/MP4Splitter/MP4Splitter.h index e7b36dc04..83e6efc38 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.h +++ b/src/filters/parser/MP4Splitter/MP4Splitter.h @@ -26,8 +26,8 @@ #include "MP4SplitterFile.h"
#include "../BaseSplitter/BaseSplitter.h"
-[uuid("61F47056-E400-43d3-AF1E-AB7DFFD4C4AD")]
-class CMP4SplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("61F47056-E400-43d3-AF1E-AB7DFFD4C4AD"))
+CMP4SplitterFilter : public CBaseSplitterFilter
{
struct trackpos {unsigned int /*AP4_Ordinal*/ index; unsigned __int64 /*AP4_TimeStamp*/ ts;};
CAtlMap<unsigned int, trackpos> m_trackpos;
@@ -51,8 +51,8 @@ public: STDMETHODIMP_(HRESULT) GetKeyFrames(const GUID* pFormat, REFERENCE_TIME* pKFs, UINT& nKFs);
};
-[uuid("3CCC052E-BDEE-408a-BEA7-90914EF2964B")]
-class CMP4SourceFilter : public CMP4SplitterFilter
+class __declspec(uuid("3CCC052E-BDEE-408a-BEA7-90914EF2964B"))
+CMP4SourceFilter : public CMP4SplitterFilter
{
public:
CMP4SourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
@@ -60,8 +60,8 @@ public: // for raw mpeg4 elementary streams:
-[uuid("D3D9D58B-45B5-48AB-B199-B8C40560AEC7")]
-class CMPEG4VideoSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("D3D9D58B-45B5-48AB-B199-B8C40560AEC7"))
+CMPEG4VideoSplitterFilter : public CBaseSplitterFilter
{
__int64 m_seqhdrsize;
int NextStartCode();
@@ -79,8 +79,8 @@ public: CMPEG4VideoSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("E2B98EEA-EE55-4E9B-A8C1-6E5288DF785A")]
-class CMPEG4VideoSourceFilter : public CMPEG4VideoSplitterFilter
+class __declspec(uuid("E2B98EEA-EE55-4E9B-A8C1-6E5288DF785A"))
+CMPEG4VideoSourceFilter : public CMPEG4VideoSplitterFilter
{
public:
CMPEG4VideoSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h index 05eb7d814..dc73dc417 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h @@ -68,8 +68,8 @@ public: HRESULT DeliverEndOfStream();
};
-[uuid("149D2E01-C32E-4939-80F6-C07B81015A7A")]
-class CMatroskaSplitterFilter : public CBaseSplitterFilter, public ITrackInfo
+class __declspec(uuid("149D2E01-C32E-4939-80F6-C07B81015A7A"))
+CMatroskaSplitterFilter : public CBaseSplitterFilter, public ITrackInfo
{
void SetupChapters(LPCSTR lng, MatroskaReader::ChapterAtom* parent, int level = 0);
void InstallFonts();
@@ -113,8 +113,8 @@ public: STDMETHODIMP_(BSTR) GetTrackCodecDownloadURL(UINT aTrackIdx);
};
-[uuid("0A68C3B5-9164-4a54-AFAF-995B2FF0E0D4")]
-class CMatroskaSourceFilter : public CMatroskaSplitterFilter
+class __declspec(uuid("0A68C3B5-9164-4a54-AFAF-995B2FF0E0D4"))
+CMatroskaSourceFilter : public CMatroskaSplitterFilter
{
public:
CMatroskaSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.h b/src/filters/parser/MpaSplitter/MpaSplitter.h index c2ce4c934..946ec8647 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.h +++ b/src/filters/parser/MpaSplitter/MpaSplitter.h @@ -24,8 +24,8 @@ #include "../BaseSplitter/BaseSplitter.h"
#include "MpaSplitterFile.h"
-[uuid("0E9D4BF7-CBCB-46C7-BD80-4EF223A3DC2B")]
-class CMpaSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("0E9D4BF7-CBCB-46C7-BD80-4EF223A3DC2B"))
+CMpaSplitterFilter : public CBaseSplitterFilter
{
REFERENCE_TIME m_rtStart;
@@ -46,8 +46,8 @@ public: STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
};
-[uuid("59A0DB73-0287-4C9A-9D3C-8CFF39F8E5DB")]
-class CMpaSourceFilter : public CMpaSplitterFilter
+class __declspec(uuid("59A0DB73-0287-4C9A-9D3C-8CFF39F8E5DB"))
+CMpaSourceFilter : public CMpaSplitterFilter
{
public:
CMpaSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h index fb20de487..b7fac675c 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.h +++ b/src/filters/parser/MpegSplitter/MpegSplitter.h @@ -24,8 +24,8 @@ #include "../BaseSplitter/BaseSplitter.h"
#include "MpegSplitterFile.h"
-[uuid("DC257063-045F-4BE2-BD5B-E12279C464F0")]
-class CMpegSplitterFilter : public CBaseSplitterFilter, public IAMStreamSelect
+class __declspec(uuid("DC257063-045F-4BE2-BD5B-E12279C464F0"))
+CMpegSplitterFilter : public CBaseSplitterFilter, public IAMStreamSelect
{
REFERENCE_TIME m_rtStartOffset;
bool m_pPipoBimbo;
@@ -59,8 +59,8 @@ public: STDMETHODIMP Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD* pdwFlags, LCID* plcid, DWORD* pdwGroup, WCHAR** ppszName, IUnknown** ppObject, IUnknown** ppUnk);
};
-[uuid("1365BE7A-C86A-473C-9A41-C0A6E82C9FA3")]
-class CMpegSourceFilter : public CMpegSplitterFilter
+class __declspec(uuid("1365BE7A-C86A-473C-9A41-C0A6E82C9FA3"))
+CMpegSourceFilter : public CMpegSplitterFilter
{
public:
CMpegSourceFilter(LPUNKNOWN pUnk, HRESULT* phr, const CLSID& clsid = __uuidof(CMpegSourceFilter));
diff --git a/src/filters/parser/NutSplitter/NutSplitter.h b/src/filters/parser/NutSplitter/NutSplitter.h index 3eb99904d..5d447d3d8 100644 --- a/src/filters/parser/NutSplitter/NutSplitter.h +++ b/src/filters/parser/NutSplitter/NutSplitter.h @@ -28,8 +28,8 @@ DEFINE_GUID(MEDIASUBTYPE_Nut,
0x5eb7173e, 0xaa71, 0x4a54, 0xbd, 0xd1, 0x1c, 0xa5, 0x7d, 0x20, 0x40, 0x5f);
-[uuid("90514D6A-76B7-4405-88A8-B4B1EF6061C6")]
-class CNutSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("90514D6A-76B7-4405-88A8-B4B1EF6061C6"))
+CNutSplitterFilter : public CBaseSplitterFilter
{
CAutoPtr<CNutFile> m_pFile;
@@ -47,8 +47,8 @@ public: STDMETHODIMP GetDuration(LONGLONG* pDuration);
};
-[uuid("918B5A9F-DFED-4532-83A9-9B16D83ED73F")]
-class CNutSourceFilter : public CNutSplitterFilter
+class __declspec(uuid("918B5A9F-DFED-4532-83A9-9B16D83ED73F"))
+CNutSourceFilter : public CNutSplitterFilter
{
public:
CNutSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/OggSplitter/OggSplitter.h b/src/filters/parser/OggSplitter/OggSplitter.h index b033f76bb..212a9504c 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.h +++ b/src/filters/parser/OggSplitter/OggSplitter.h @@ -172,8 +172,8 @@ public: bool IsInitialized() {return m_initpackets.GetCount() >= 3;}
};
-[uuid("9FF48807-E133-40AA-826F-9B2959E5232D")]
-class COggSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("9FF48807-E133-40AA-826F-9B2959E5232D"))
+COggSplitterFilter : public CBaseSplitterFilter
{
protected:
CAutoPtr<COggFile> m_pFile;
@@ -188,8 +188,8 @@ public: virtual ~COggSplitterFilter();
};
-[uuid("6D3688CE-3E9D-42F4-92CA-8A11119D25CD")]
-class COggSourceFilter : public COggSplitterFilter
+class __declspec(uuid("6D3688CE-3E9D-42F4-92CA-8A11119D25CD"))
+COggSourceFilter : public COggSplitterFilter
{
public:
COggSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h index 42b28e5da..1d725661b 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h @@ -179,8 +179,8 @@ public: HRESULT DeliverEndFlush();
};
-[uuid("E21BE468-5C18-43EB-B0CC-DB93A847D769")]
-class CRealMediaSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("E21BE468-5C18-43EB-B0CC-DB93A847D769"))
+CRealMediaSplitterFilter : public CBaseSplitterFilter
{
protected:
CAutoPtr<CRMFile> m_pFile;
@@ -204,8 +204,8 @@ public: STDMETHODIMP_(HRESULT) GetKeyFrames(const GUID* pFormat, REFERENCE_TIME* pKFs, UINT& nKFs);
};
-[uuid("765035B3-5944-4A94-806B-20EE3415F26F")]
-class CRealMediaSourceFilter : public CRealMediaSplitterFilter
+class __declspec(uuid("765035B3-5944-4A94-806B-20EE3415F26F"))
+CRealMediaSourceFilter : public CRealMediaSplitterFilter
{
public:
CRealMediaSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
@@ -213,8 +213,8 @@ public: ////////////
-[uuid("238D0F23-5DC9-45A6-9BE2-666160C324DD")]
-class CRealVideoDecoder : public CBaseVideoFilter
+class __declspec(uuid("238D0F23-5DC9-45A6-9BE2-666160C324DD"))
+CRealVideoDecoder : public CBaseVideoFilter
{
typedef HRESULT (WINAPI *PRVCustomMessage)(void*, DWORD);
typedef HRESULT (WINAPI *PRVFree)(DWORD);
@@ -262,8 +262,8 @@ public: HRESULT AlterQuality(Quality q);
};
-[uuid("941A4793-A705-4312-8DFC-C11CA05F397E")]
-class CRealAudioDecoder : public CTransformFilter
+class __declspec(uuid("941A4793-A705-4312-8DFC-C11CA05F397E"))
+CRealAudioDecoder : public CTransformFilter
{
typedef HRESULT (WINAPI *PCloseCodec)(DWORD);
typedef HRESULT (WINAPI *PDecode)(DWORD,BYTE*,long,BYTE*,long*,long);
diff --git a/src/filters/parser/RoQSplitter/RoQSplitter.h b/src/filters/parser/RoQSplitter/RoQSplitter.h index c7fa21108..3633c9075 100644 --- a/src/filters/parser/RoQSplitter/RoQSplitter.h +++ b/src/filters/parser/RoQSplitter/RoQSplitter.h @@ -42,8 +42,8 @@ struct roq_chunk {WORD id; DWORD size; WORD arg;}; struct roq_info {WORD w, h, unk1, unk2;};
#pragma pack(pop)
-[uuid("C73DF7C1-21F2-44C7-A430-D35FB9BB298F")]
-class CRoQSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("C73DF7C1-21F2-44C7-A430-D35FB9BB298F"))
+CRoQSplitterFilter : public CBaseSplitterFilter
{
CComPtr<IAsyncReader> m_pAsyncReader;
@@ -62,15 +62,15 @@ public: CRoQSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("02B8E5C2-4E1F-45D3-9A8E-B8F1EDE6DE09")]
-class CRoQSourceFilter : public CRoQSplitterFilter
+class __declspec(uuid("02B8E5C2-4E1F-45D3-9A8E-B8F1EDE6DE09"))
+CRoQSourceFilter : public CRoQSplitterFilter
{
public:
CRoQSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("FBEFC5EC-ABA0-4E6C-ACA3-D05FDFEFB853")]
-class CRoQVideoDecoder : public CTransformFilter
+class __declspec(uuid("FBEFC5EC-ABA0-4E6C-ACA3-D05FDFEFB853"))
+CRoQVideoDecoder : public CTransformFilter
{
CCritSec m_csReceive;
@@ -108,8 +108,8 @@ public: HRESULT StopStreaming();
};
-[uuid("226FAF85-E358-4502-8C98-F4224BE76953")]
-class CRoQAudioDecoder : public CTransformFilter
+class __declspec(uuid("226FAF85-E358-4502-8C98-F4224BE76953"))
+CRoQAudioDecoder : public CTransformFilter
{
public:
CRoQAudioDecoder(LPUNKNOWN lpunk, HRESULT* phr);
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.h b/src/filters/parser/SSFSplitter/SSFSplitter.h index abd82b5fe..a0bf9f5a8 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.h +++ b/src/filters/parser/SSFSplitter/SSFSplitter.h @@ -24,8 +24,8 @@ #include "../BaseSplitter/BaseSplitter.h"
#include "../../../subtitles/libssf/SubtitleFile.h"
-[uuid("95C3F9F6-1E05-4C34-8122-504476EACB51")]
-class CSSFSplitterFilter : public CBaseSplitterFilter
+class __declspec(uuid("95C3F9F6-1E05-4C34-8122-504476EACB51"))
+CSSFSplitterFilter : public CBaseSplitterFilter
{
CAutoPtr<CBaseSplitterFile> m_pFile;
@@ -49,8 +49,8 @@ public: CSSFSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-[uuid("57F46A2A-6DC9-4A9F-B5FA-DFDD62B8BAFB")]
-class CSSFSourceFilter : public CSSFSplitterFilter
+class __declspec(uuid("57F46A2A-6DC9-4A9F-B5FA-DFDD62B8BAFB"))
+CSSFSourceFilter : public CSSFSplitterFilter
{
public:
CSSFSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.h b/src/filters/parser/StreamDriveThru/StreamDriveThru.h index 08a2ebe16..ee6f552e8 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.h +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.h @@ -76,8 +76,8 @@ public: STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
-[uuid("534FE6FD-F1F0-4aec-9F45-FF397320CE33")]
-class CStreamDriveThruFilter : public CBaseFilter, protected CAMThread, public IMediaSeeking
+class __declspec(uuid("534FE6FD-F1F0-4aec-9F45-FF397320CE33"))
+CStreamDriveThruFilter : public CBaseFilter, protected CAMThread, public IMediaSeeking
{
CCritSec m_csLock;
diff --git a/src/filters/reader/CDDAReader/CDDAReader.h b/src/filters/reader/CDDAReader/CDDAReader.h index d3ac17c0a..f0a9286ee 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.h +++ b/src/filters/reader/CDDAReader/CDDAReader.h @@ -73,8 +73,8 @@ public: void Unlock();
};
-[uuid("54A35221-2C8D-4a31-A5DF-6D809847E393")]
-class CCDDAReader
+class __declspec(uuid("54A35221-2C8D-4a31-A5DF-6D809847E393"))
+CCDDAReader
: public CAsyncReader
, public IFileSourceFilter
, public IAMMediaContent
diff --git a/src/filters/reader/CDXAReader/CDXAReader.h b/src/filters/reader/CDXAReader/CDXAReader.h index 56a34be86..128ad0059 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.h +++ b/src/filters/reader/CDXAReader/CDXAReader.h @@ -66,8 +66,8 @@ public: GUID m_subtype;
};
-[uuid("D367878E-F3B8-4235-A968-F378EF1B9A44")]
-class CCDXAReader
+class __declspec(uuid("D367878E-F3B8-4235-A968-F378EF1B9A44"))
+CCDXAReader
: public CAsyncReader
, public IFileSourceFilter
{
diff --git a/src/filters/reader/UDPReader/UDPReader.h b/src/filters/reader/UDPReader/UDPReader.h index 863fa277d..255520d6a 100644 --- a/src/filters/reader/UDPReader/UDPReader.h +++ b/src/filters/reader/UDPReader/UDPReader.h @@ -68,8 +68,8 @@ public: void Unlock();
};
-[uuid("0E4221A9-9718-48D5-A5CF-4493DAD4A015")]
-class CUDPReader
+class __declspec(uuid("0E4221A9-9718-48D5-A5CF-4493DAD4A015"))
+CUDPReader
: public CAsyncReader
, public IFileSourceFilter
{
diff --git a/src/filters/reader/VTSReader/VTSReader.h b/src/filters/reader/VTSReader/VTSReader.h index 992351bfc..425d3976b 100644 --- a/src/filters/reader/VTSReader/VTSReader.h +++ b/src/filters/reader/VTSReader/VTSReader.h @@ -49,8 +49,8 @@ public: void Unlock();
};
-[uuid("773EAEDE-D5EE-4fce-9C8F-C4F53D0A2F73")]
-class CVTSReader
+class __declspec(uuid("773EAEDE-D5EE-4fce-9C8F-C4F53D0A2F73"))
+CVTSReader
: public CAsyncReader
, public IFileSourceFilter
{
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h index 83b937b08..bd0ef8559 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h @@ -43,8 +43,8 @@ // uncomment the #define below
#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x019)
-[uuid("601D2A2B-9CDE-40bd-8650-0485E3522727")]
-class CMpcAudioRenderer : public CBaseRenderer
+class __declspec(uuid("601D2A2B-9CDE-40bd-8650-0485E3522727"))
+CMpcAudioRenderer : public CBaseRenderer
{
public:
CMpcAudioRenderer(LPUNKNOWN punk, HRESULT *phr);
diff --git a/src/filters/renderer/SyncClock/SyncClock.h b/src/filters/renderer/SyncClock/SyncClock.h index 54bef1292..110a318f8 100644 --- a/src/filters/renderer/SyncClock/SyncClock.h +++ b/src/filters/renderer/SyncClock/SyncClock.h @@ -30,8 +30,8 @@ private: REFERENCE_TIME GetTicks100ns();
};
-[uuid("57797fe5-ee9b-4408-98a9-20b134e7e8f0")]
-class CSyncClockFilter: public ISyncClock, public CBaseFilter
+class __declspec(uuid("57797fe5-ee9b-4408-98a9-20b134e7e8f0"))
+CSyncClockFilter: public ISyncClock, public CBaseFilter
{
public:
CSyncClockFilter(LPUNKNOWN pUnk, HRESULT *phr);
diff --git a/src/filters/renderer/VideoRenderers/IQTVideoSurface.h b/src/filters/renderer/VideoRenderers/IQTVideoSurface.h index 2f55ca95e..8c6ab9868 100644 --- a/src/filters/renderer/VideoRenderers/IQTVideoSurface.h +++ b/src/filters/renderer/VideoRenderers/IQTVideoSurface.h @@ -27,8 +27,8 @@ // IQTVideoSurface
//
-[uuid("A6AE36F7-A6F2-4157-AF54-6599857E4E20")]
-interface IQTVideoSurface :
+interface __declspec(uuid("A6AE36F7-A6F2-4157-AF54-6599857E4E20"))
+IQTVideoSurface :
public IUnknown
{
STDMETHOD (BeginBlt) (const BITMAP& bm) PURE;
diff --git a/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h index 9e3caaa0d..3a02b63d8 100644 --- a/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h @@ -26,8 +26,8 @@ // {F9F62627-E3EF-4a2e-B6C9-5D4C0DC3326B}
DEFINE_GUID(CLSID_SyncAllocatorPresenter, 0xf9f62627, 0xe3ef, 0x4a2e, 0xb6, 0xc9, 0x5d, 0x4c, 0xd, 0xc3, 0x32, 0x6b);
-[uuid("F891C2A9-1DFF-45e0-9129-30C0990C5A9F")]
-interface ISyncClockAdviser : public IUnknown
+interface __declspec(uuid("F891C2A9-1DFF-45e0-9129-30C0990C5A9F"))
+ISyncClockAdviser : public IUnknown
{
STDMETHOD (AdviseSyncClock)(ISyncClock* sC) PURE;
};
diff --git a/src/filters/source/D2VSource/D2VSource.h b/src/filters/source/D2VSource/D2VSource.h index bf2e18f9a..26362b0ce 100644 --- a/src/filters/source/D2VSource/D2VSource.h +++ b/src/filters/source/D2VSource/D2VSource.h @@ -23,8 +23,8 @@ class CD2VStream;
-[uuid("47CE0591-C4D5-4b41-BED7-28F59AD76228")]
-class CD2VSource : public CBaseSource<CD2VStream>
+class __declspec(uuid("47CE0591-C4D5-4b41-BED7-28F59AD76228"))
+CD2VSource : public CBaseSource<CD2VStream>
{
public:
CD2VSource(LPUNKNOWN lpunk, HRESULT* phr);
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.h b/src/filters/source/DTSAC3Source/DTSAC3Source.h index 6c9a30140..067b03268 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.h +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.h @@ -26,8 +26,8 @@ class CDTSAC3Stream;
-[uuid("B4A7BE85-551D-4594-BDC7-832B09185041")]
-class CDTSAC3Source : public CBaseSource<CDTSAC3Stream>
+class __declspec(uuid("B4A7BE85-551D-4594-BDC7-832B09185041"))
+CDTSAC3Source : public CBaseSource<CDTSAC3Stream>
{
public:
CDTSAC3Source(LPUNKNOWN lpunk, HRESULT* phr);
diff --git a/src/filters/source/FLICSource/FLICSource.h b/src/filters/source/FLICSource/FLICSource.h index acbade1e8..7d54a274f 100644 --- a/src/filters/source/FLICSource/FLICSource.h +++ b/src/filters/source/FLICSource/FLICSource.h @@ -76,8 +76,8 @@ struct FLIC_FRAME_ENTRY FLIC_FRAME hdr;
};
-[uuid("17DB5CF6-39BB-4d5b-B0AA-BEBA44673AD4")]
-class CFLICSource
+class __declspec(uuid("17DB5CF6-39BB-4d5b-B0AA-BEBA44673AD4"))
+CFLICSource
: public CSource
, public IFileSourceFilter
, public IAMFilterMiscFlags
diff --git a/src/filters/source/FlacSource/FlacSource.h b/src/filters/source/FlacSource/FlacSource.h index 3b7f87969..98fb86d7a 100644 --- a/src/filters/source/FlacSource/FlacSource.h +++ b/src/filters/source/FlacSource/FlacSource.h @@ -26,8 +26,8 @@ class CFlacStream;
-[uuid("1930D8FF-4739-4e42-9199-3B2EDEAA3BF2")]
-class CFlacSource : public CBaseSource<CFlacStream>
+class __declspec(uuid("1930D8FF-4739-4e42-9199-3B2EDEAA3BF2"))
+CFlacSource : public CBaseSource<CFlacStream>
{
public:
CFlacSource(LPUNKNOWN lpunk, HRESULT* phr);
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.h b/src/filters/source/ShoutcastSource/ShoutcastSource.h index ab45dbf4f..fd512afcf 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.h +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.h @@ -27,8 +27,8 @@ #include <afxsock.h>
#include <qnetwork.h>
-[uuid("68F540E9-766F-44d2-AB07-E26CC6D27A79")]
-class CShoutcastSource
+class __declspec(uuid("68F540E9-766F-44d2-AB07-E26CC6D27A79"))
+CShoutcastSource
: public CSource
, public IFileSourceFilter
, public IAMFilterMiscFlags
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.h b/src/filters/source/SubtitleSource/SubtitleSource.h index 77ef35581..c46cbe83a 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.h +++ b/src/filters/source/SubtitleSource/SubtitleSource.h @@ -86,8 +86,8 @@ public: STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
-[uuid("E44CA3B5-A0FF-41A0-AF16-42429B1095EA")]
-class CSubtitleSourceASCII : public CSubtitleSource
+class __declspec(uuid("E44CA3B5-A0FF-41A0-AF16-42429B1095EA"))
+CSubtitleSourceASCII : public CSubtitleSource
{
public:
CSubtitleSourceASCII(LPUNKNOWN lpunk, HRESULT* phr);
@@ -95,8 +95,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("87864E0F-7073-4E39-B802-143DE0ED4964")]
-class CSubtitleSourceUTF8 : public CSubtitleSource
+class __declspec(uuid("87864E0F-7073-4E39-B802-143DE0ED4964"))
+CSubtitleSourceUTF8 : public CSubtitleSource
{
public:
CSubtitleSourceUTF8(LPUNKNOWN lpunk, HRESULT* phr);
@@ -104,8 +104,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("18316B1A-5877-4CC4-85FD-EDE65CD489EC")]
-class CSubtitleSourceSSA : public CSubtitleSource
+class __declspec(uuid("18316B1A-5877-4CC4-85FD-EDE65CD489EC"))
+CSubtitleSourceSSA : public CSubtitleSource
{
public:
CSubtitleSourceSSA(LPUNKNOWN lpunk, HRESULT* phr);
@@ -113,8 +113,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("416782BC-1D87-48C0-8F65-F113A5CB8E15")]
-class CSubtitleSourceASS : public CSubtitleSource
+class __declspec(uuid("416782BC-1D87-48C0-8F65-F113A5CB8E15"))
+CSubtitleSourceASS : public CSubtitleSource
{
public:
CSubtitleSourceASS(LPUNKNOWN lpunk, HRESULT* phr);
@@ -122,8 +122,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("D7215AFC-DFE6-483B-9AF3-6BBECFF14CF4")]
-class CSubtitleSourceUSF : public CSubtitleSource
+class __declspec(uuid("D7215AFC-DFE6-483B-9AF3-6BBECFF14CF4"))
+CSubtitleSourceUSF : public CSubtitleSource
{
public:
CSubtitleSourceUSF(LPUNKNOWN lpunk, HRESULT* phr);
@@ -131,8 +131,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("932E75D4-BBD4-4A0F-9071-6728FBDC4C98")]
-class CSubtitleSourcePreview : public CSubtitleSource
+class __declspec(uuid("932E75D4-BBD4-4A0F-9071-6728FBDC4C98"))
+CSubtitleSourcePreview : public CSubtitleSource
{
public:
CSubtitleSourcePreview(LPUNKNOWN lpunk, HRESULT* phr);
@@ -140,8 +140,8 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-[uuid("CF0D7280-527D-415E-BA02-56017484D73E")]
-class CSubtitleSourceARGB : public CSubtitleSource
+class __declspec(uuid("CF0D7280-527D-415E-BA02-56017484D73E"))
+CSubtitleSourceARGB : public CSubtitleSource
{
public:
CSubtitleSourceARGB(LPUNKNOWN lpunk, HRESULT* phr);
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.h b/src/filters/switcher/AudioSwitcher/AudioSwitcher.h index bef3a11c8..a46da0d00 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.h +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.h @@ -20,8 +20,8 @@ #include "StreamSwitcher.h"
-[uuid("CEDB2890-53AE-4231-91A3-B0AAFCD1DBDE")]
-interface IAudioSwitcherFilter : public IUnknown
+interface __declspec(uuid("CEDB2890-53AE-4231-91A3-B0AAFCD1DBDE"))
+IAudioSwitcherFilter : public IUnknown
{
STDMETHOD(GetInputSpeakerConfig) (DWORD* pdwChannelMask) = 0;
STDMETHOD(GetSpeakerConfig) (bool* pfCustomChannelMapping, DWORD pSpeakerToChannelMap[18][18]) = 0;
@@ -37,8 +37,8 @@ interface IAudioSwitcherFilter : public IUnknown class AudioStreamResampler;
-[uuid("18C16B08-6497-420e-AD14-22D21C2CEAB7")]
-class CAudioSwitcherFilter : public CStreamSwitcherFilter, public IAudioSwitcherFilter
+class __declspec(uuid("18C16B08-6497-420e-AD14-22D21C2CEAB7"))
+CAudioSwitcherFilter : public CStreamSwitcherFilter, public IAudioSwitcherFilter
{
typedef struct {DWORD Speaker, Channel;} ChMap;
CAtlArray<ChMap> m_chs[18];
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 2fddd487e..081c3e1af 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -290,8 +290,8 @@ CStreamSwitcherInputPin::CStreamSwitcherInputPin(CStreamSwitcherFilter* pFilter, m_bCanReconnectWhenActive = TRUE;
}
-[uuid("138130AF-A79B-45D5-B4AA-87697457BA87")]
-class NeroAudioDecoder {};
+class __declspec(uuid("138130AF-A79B-45D5-B4AA-87697457BA87"))
+NeroAudioDecoder {};
STDMETHODIMP CStreamSwitcherInputPin::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
@@ -900,8 +900,8 @@ HRESULT CStreamSwitcherOutputPin::DecideBufferSize(IMemAllocator* pAllocator, AL // virtual
-[uuid("AEFA5024-215A-4FC7-97A4-1043C86FD0B8")]
-class MatrixMixer {};
+class __declspec(uuid("AEFA5024-215A-4FC7-97A4-1043C86FD0B8"))
+MatrixMixer {};
HRESULT CStreamSwitcherOutputPin::CheckConnect(IPin* pPin)
{
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h index e6a7f17b7..be5a6fc32 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h @@ -113,8 +113,8 @@ public: void NotifyMediaType(const CMediaType& mt);
};
-[uuid("DA395FA3-4A3E-4D85-805E-0BEFF53D4BCD")]
-interface IStreamSwitcherInputPin : public IUnknown
+interface __declspec(uuid("DA395FA3-4A3E-4D85-805E-0BEFF53D4BCD"))
+IStreamSwitcherInputPin : public IUnknown
{
STDMETHOD_(bool, IsActive)() = 0;
};
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.h b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.h index 30d36fa51..11e643765 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.h +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.h @@ -46,8 +46,8 @@ typedef struct tagDOLBYAC3WAVEFORMAT // CAVI2AC3Filter
//
-[uuid("93230DD0-7B3C-4efb-AFBB-DC380FEC9E6B")]
-class CAVI2AC3Filter : public CTransformFilter
+class __declspec(uuid("93230DD0-7B3C-4efb-AFBB-DC380FEC9E6B"))
+CAVI2AC3Filter : public CTransformFilter
{
bool CheckAC3(const CMediaType* pmt);
bool CheckDTS(const CMediaType* pmt);
diff --git a/src/filters/transform/BufferFilter/BufferFilter.h b/src/filters/transform/BufferFilter/BufferFilter.h index a65d7a16c..33561398e 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.h +++ b/src/filters/transform/BufferFilter/BufferFilter.h @@ -23,8 +23,8 @@ #include <atlbase.h>
-[uuid("63EF0035-3FFE-4c41-9230-4346E028BE20")]
-interface IBufferFilter : public IUnknown
+interface __declspec(uuid("63EF0035-3FFE-4c41-9230-4346E028BE20"))
+IBufferFilter : public IUnknown
{
STDMETHOD(SetBuffers) (int nBuffers) = 0;
STDMETHOD_(int, GetBuffers) () = 0;
@@ -32,8 +32,8 @@ interface IBufferFilter : public IUnknown STDMETHOD(SetPriority) (DWORD dwPriority = THREAD_PRIORITY_NORMAL) = 0;
};
-[uuid("DA2B3D77-2F29-4fd2-AC99-DEE4A8A13BF0")]
-class CBufferFilter : public CTransformFilter, public IBufferFilter
+class __declspec(uuid("DA2B3D77-2F29-4fd2-AC99-DEE4A8A13BF0"))
+CBufferFilter : public CTransformFilter, public IBufferFilter
{
int m_nSamplesToBuffer;
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.h b/src/filters/transform/DeCSSFilter/DeCSSFilter.h index e31b1ffa3..a16cfba27 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.h +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.h @@ -21,8 +21,8 @@ #pragma once
-[uuid("7B3BD419-FE03-4820-BE94-A22A4F844895")]
-class CDeCSSFilter : public CTransformFilter
+class __declspec(uuid("7B3BD419-FE03-4820-BE94-A22A4F844895"))
+CDeCSSFilter : public CTransformFilter
{
friend class CKsPSInputPin;
diff --git a/src/filters/transform/MPCVideoDec/IMPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/IMPCVideoDecFilter.h index 63c8bf54f..faa3de923 100644 --- a/src/filters/transform/MPCVideoDec/IMPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/IMPCVideoDecFilter.h @@ -42,8 +42,8 @@ typedef enum MPCVD_VP6 = MPCVD_VC1_DXVA<<1
} MPC_VIDEO_CODEC;
-[uuid("CDC3B5B3-A8B0-4c70-A805-9FC80CDEF262")]
-interface IMPCVideoDecFilter : public IUnknown
+interface __declspec(uuid("CDC3B5B3-A8B0-4c70-A805-9FC80CDEF262"))
+IMPCVideoDecFilter : public IUnknown
{
STDMETHOD(Apply()) = 0;
diff --git a/src/filters/transform/MPCVideoDec/MPCAudioDecFilter.h b/src/filters/transform/MPCVideoDec/MPCAudioDecFilter.h index 8bbda59ad..2f1bae396 100644 --- a/src/filters/transform/MPCVideoDec/MPCAudioDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCAudioDecFilter.h @@ -24,8 +24,8 @@ enum SampleFormat;
-[uuid("BF67339B-465E-4c5a-AE2D-DC4EE17EA272")]
-class CMPCAudioDecFilter
+class __declspec(uuid("BF67339B-465E-4c5a-AE2D-DC4EE17EA272"))
+CMPCAudioDecFilter
: public CTransformFilter
{
public:
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h index 139487571..c56d7da81 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h @@ -65,8 +65,8 @@ typedef struct int nBuffPos;
} BUFFER_TIME;
-[uuid("008BAC12-FBAF-497b-9670-BC6F6FBAE2C4")]
-class CMPCVideoDecFilter
+class __declspec(uuid("008BAC12-FBAF-497b-9670-BC6F6FBAE2C4"))
+CMPCVideoDecFilter
: public CBaseVideoFilter
, public TlibavcodecExt
, public ISpecifyPropertyPages2
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h index cdff3ed2b..4e0dd588e 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h @@ -26,8 +26,8 @@ #include "IMPCVideoDecFilter.h"
#include <afxcmn.h>
-[uuid("D5AA0389-D274-48e1-BF50-ACB05A56DDE0")]
-class CMPCVideoDecSettingsWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("D5AA0389-D274-48e1-BF50-ACB05A56DDE0"))
+CMPCVideoDecSettingsWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IMPCVideoDecFilter> m_pMDF;
@@ -85,8 +85,8 @@ public: -[uuid("3C395D46-8B0F-440d-B962-2F4A97355453")]
-class CMPCVideoDecCodecWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("3C395D46-8B0F-440d-B962-2F4A97355453"))
+CMPCVideoDecCodecWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IMPCVideoDecFilter> m_pMDF;
diff --git a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h index c0bbcd0f7..be49e6866 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h +++ b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h @@ -31,8 +31,8 @@ class CMPCVideoDecFilter; class CVideoDecDXVAAllocator;
-[uuid("AE7EC2A2-1913-4a80-8DD6-DF1497ABA494")]
-interface IMPCDXVA2Sample : public IUnknown
+interface __declspec(uuid("AE7EC2A2-1913-4a80-8DD6-DF1497ABA494"))
+IMPCDXVA2Sample : public IUnknown
{
STDMETHOD_(int, GetDXSurfaceId()) = 0;
};
diff --git a/src/filters/transform/MpaDecFilter/IMpaDecFilter.h b/src/filters/transform/MpaDecFilter/IMpaDecFilter.h index cb044aa40..f018de415 100644 --- a/src/filters/transform/MpaDecFilter/IMpaDecFilter.h +++ b/src/filters/transform/MpaDecFilter/IMpaDecFilter.h @@ -34,8 +34,8 @@ enum DolbyDigitalMode };
-[uuid("2067C60F-752F-4EBD-B0B1-4CBC5E00741C")]
-interface IMpaDecFilter : public IUnknown
+interface __declspec(uuid("2067C60F-752F-4EBD-B0B1-4CBC5E00741C"))
+IMpaDecFilter : public IUnknown
{
enum enctype {ac3, dts, aac, etlast};
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.h b/src/filters/transform/MpaDecFilter/MpaDecFilter.h index 6c1711fae..a7de54e8a 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.h +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.h @@ -83,8 +83,8 @@ struct AVFrame; struct AVCodecParserContext;
-[uuid("3D446B6F-71DE-4437-BE15-8CE47174340F")]
-class CMpaDecFilter
+class __declspec(uuid("3D446B6F-71DE-4437-BE15-8CE47174340F"))
+CMpaDecFilter
: public CTransformFilter
, public IMpaDecFilter
, public ISpecifyPropertyPages2
diff --git a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h index cf459b705..02ae9a172 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h +++ b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.h @@ -25,8 +25,8 @@ #include "MpaDecFilter.h"
#include <afxcmn.h>
-[uuid("24103041-884B-4772-B0D3-A600E7CBFEC7")]
-class CMpaDecSettingsWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("24103041-884B-4772-B0D3-A600E7CBFEC7"))
+CMpaDecSettingsWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IMpaDecFilter> m_pMDF;
diff --git a/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h b/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h index b696b4a9e..21657c003 100644 --- a/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h +++ b/src/filters/transform/MpaDecFilter/faad2/libfaad/common.h @@ -346,7 +346,7 @@ char *strchr(), *strrchr(); #ifdef __ICL /* only Intel C compiler has fmath ??? */ - #include <mathf.h> + //#include <mathf.h> #define sin sinf #define cos cosf diff --git a/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h index dea9aa3df..d0576d02a 100644 --- a/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h @@ -23,8 +23,8 @@ typedef enum {DIAuto, DIWeave, DIBlend, DIBob, DIFieldShift, DIELA} ditype;
-[uuid("0ABEAA65-0317-47B9-AE1D-D9EA905AFD25")]
-interface IMpeg2DecFilter : public IUnknown
+interface __declspec(uuid("0ABEAA65-0317-47B9-AE1D-D9EA905AFD25"))
+IMpeg2DecFilter : public IUnknown
{
STDMETHOD(SetDeinterlaceMethod(ditype di)) = 0;
STDMETHOD_(ditype, GetDeinterlaceMethod()) = 0;
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h index 77eb9f0c6..3e9bd9138 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h @@ -32,8 +32,8 @@ class CSubpicInputPin; class CClosedCaptionOutputPin;
class CMpeg2Dec;
-[uuid("39F498AF-1A09-4275-B193-673B0BA3D478")]
-class CMpeg2DecFilter
+class __declspec(uuid("39F498AF-1A09-4275-B193-673B0BA3D478"))
+CMpeg2DecFilter
: public CBaseVideoFilter
, public IMpeg2DecFilter
, public ISpecifyPropertyPages2
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.h b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.h index 4f694d8cb..6d147a699 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.h +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.h @@ -25,8 +25,8 @@ #include "IMpeg2DecFilter.h"
#include <afxcmn.h>
-[uuid("E5FB6957-65E6-491B-BB37-B25C9FE3BEA7")]
-class CMpeg2DecSettingsWnd : public CInternalPropertyPageWnd
+class __declspec(uuid("E5FB6957-65E6-491B-BB37-B25C9FE3BEA7"))
+CMpeg2DecSettingsWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IMpeg2DecFilter> m_pM2DF;
diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.h b/src/filters/transform/vsfilter/DirectVobSubFilter.h index 56989aebb..76f796c13 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.h +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.h @@ -38,8 +38,8 @@ typedef struct /* This is for graphedit */
-[uuid("93A22E7A-5091-45ef-BA61-6DA26156A5D0")]
-class CDirectVobSubFilter
+class __declspec(uuid("93A22E7A-5091-45ef-BA61-6DA26156A5D0"))
+CDirectVobSubFilter
: public CBaseVideoFilter
, public CDirectVobSub
, public ISpecifyPropertyPages
@@ -180,8 +180,8 @@ private: /* The "auto-loading" version */
-[uuid("9852A670-F845-491b-9BE6-EBD841B8A613")]
-class CDirectVobSubFilter2 : public CDirectVobSubFilter
+class __declspec(uuid("9852A670-F845-491b-9BE6-EBD841B8A613"))
+CDirectVobSubFilter2 : public CDirectVobSubFilter
{
bool ShouldWeAutoload(IFilterGraph* pGraph);
void GetRidOfInternalScriptRenderer();
diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.h b/src/filters/transform/vsfilter/DirectVobSubPropPage.h index 5e0d7fe07..86ecdafe6 100644 --- a/src/filters/transform/vsfilter/DirectVobSubPropPage.h +++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.h @@ -59,8 +59,8 @@ protected: void BindControl(UINT id, CWnd& control);
};
-[uuid("60765CF5-01C2-4ee7-A44B-C791CF25FEA0")]
-class CDVSMainPPage : public CDVSBasePPage
+class __declspec(uuid("60765CF5-01C2-4ee7-A44B-C791CF25FEA0"))
+CDVSMainPPage : public CDVSBasePPage
{
void FreeLangs(), AllocLangs(int nLangs);
@@ -91,8 +91,8 @@ public: virtual ~CDVSMainPPage();
};
-[uuid("0180E49C-13BF-46db-9AFD-9F52292E1C22")]
-class CDVSGeneralPPage : public CDVSBasePPage
+class __declspec(uuid("0180E49C-13BF-46db-9AFD-9F52292E1C22"))
+CDVSGeneralPPage : public CDVSBasePPage
{
int m_HorExt, m_VerExt, m_ResX2, m_ResX2minw, m_ResX2minh;
int m_LoadLevel;
@@ -114,8 +114,8 @@ public: CDVSGeneralPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("A8B25C0E-0894-4531-B668-AB1599FAF7F6")]
-class CDVSMiscPPage : public CDVSBasePPage
+class __declspec(uuid("A8B25C0E-0894-4531-B668-AB1599FAF7F6"))
+CDVSMiscPPage : public CDVSBasePPage
{
bool m_fFlipPicture, m_fFlipSubtitles, m_fHideSubtitles, m_fOSD, m_fDoPreBuffering, m_fReloaderDisabled, m_fSaveFullPath;
@@ -130,8 +130,8 @@ public: CDVSMiscPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("ACE4747B-35BD-4e97-9DD7-1D4245B0695C")]
-class CDVSTimingPPage : public CDVSBasePPage
+class __declspec(uuid("ACE4747B-35BD-4e97-9DD7-1D4245B0695C"))
+CDVSTimingPPage : public CDVSBasePPage
{
int m_SubtitleSpeedMul, m_SubtitleSpeedDiv, m_SubtitleDelay;
bool m_fMediaFPSEnabled;
@@ -150,8 +150,8 @@ public: CDVSTimingPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("F544E0F5-CA3C-47ea-A64D-35FCF1602396")]
-class CDVSAboutPPage : public CDVSBasePPage
+class __declspec(uuid("F544E0F5-CA3C-47ea-A64D-35FCF1602396"))
+CDVSAboutPPage : public CDVSBasePPage
{
protected:
virtual bool OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -160,8 +160,8 @@ public: CDVSAboutPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("525F116F-04AD-40a2-AE2F-A0C4E1AFEF98")]
-class CDVSZoomPPage : public CDVSBasePPage
+class __declspec(uuid("525F116F-04AD-40a2-AE2F-A0C4E1AFEF98"))
+CDVSZoomPPage : public CDVSBasePPage
{
NORMALIZEDRECT m_rect;
@@ -176,8 +176,8 @@ public: CDVSZoomPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("C2D6D98F-09CA-4524-AF64-1049B5665C9C")]
-class CDVSColorPPage : public CDVSBasePPage
+class __declspec(uuid("C2D6D98F-09CA-4524-AF64-1049B5665C9C"))
+CDVSColorPPage : public CDVSBasePPage
{
CListBox m_preflist, m_dynchglist;
CButton m_forcergb;
@@ -191,8 +191,8 @@ public: CDVSColorPPage(LPUNKNOWN lpunk, HRESULT* phr);
};
-[uuid("CE77C59C-CFD2-429f-868C-8B04D23F94CA")]
-class CDVSPathsPPage : public CDVSBasePPage
+class __declspec(uuid("CE77C59C-CFD2-429f-868C-8B04D23F94CA"))
+CDVSPathsPPage : public CDVSBasePPage
{
CStringArray m_paths;
diff --git a/src/filters/transform/vsfilter/IDirectVobSub.h b/src/filters/transform/vsfilter/IDirectVobSub.h index a789c5a66..de281ae3b 100644 --- a/src/filters/transform/vsfilter/IDirectVobSub.h +++ b/src/filters/transform/vsfilter/IDirectVobSub.h @@ -27,8 +27,8 @@ extern "C" {
#endif
- [uuid("EBE1FB08-3957-47ca-AF13-5827E5442E56")]
- interface IDirectVobSub : public IUnknown
+ interface __declspec(uuid("EBE1FB08-3957-47ca-AF13-5827E5442E56"))
+IDirectVobSub : public IUnknown
{
STDMETHOD(get_FileName) (THIS_
WCHAR* fn // fn should point to a buffer allocated to at least the length of MAX_PATH (=260)
@@ -248,22 +248,22 @@ extern "C" { ) PURE;
};
- [uuid("FE6EC6A0-21CA-4970-9EF0-B296F7F38AF0")]
- interface ISubClock : public IUnknown
+ interface __declspec(uuid("FE6EC6A0-21CA-4970-9EF0-B296F7F38AF0"))
+ISubClock : public IUnknown
{
STDMETHOD(SetTime)(REFERENCE_TIME rt) PURE;
STDMETHOD_(REFERENCE_TIME, GetTime)() PURE;
};
- [uuid("0665B760-FBC1-46C3-A35F-E471527C96A4")]
- interface ISubClock2 : public ISubClock
+ interface __declspec(uuid("0665B760-FBC1-46C3-A35F-E471527C96A4"))
+ISubClock2 : public ISubClock
{
STDMETHOD(SetAvgTimePerFrame)(REFERENCE_TIME rt) PURE;
STDMETHOD(GetAvgTimePerFrame)(REFERENCE_TIME* prt) PURE; // return S_OK only if *prt was set and is valid
};
- [uuid("AB52FC9C-2415-4dca-BC1C-8DCC2EAE8150")]
- interface IDirectVobSub2 : public IDirectVobSub
+ interface __declspec(uuid("AB52FC9C-2415-4dca-BC1C-8DCC2EAE8150"))
+IDirectVobSub2 : public IDirectVobSub
{
STDMETHOD(AdviseSubClock) (THIS_
ISubClock* pSubClock
diff --git a/src/subtitles/RTS.cpp b/src/subtitles/RTS.cpp index c6e81ce4c..4f9be693d 100644 --- a/src/subtitles/RTS.cpp +++ b/src/subtitles/RTS.cpp @@ -286,6 +286,10 @@ void CWord::Transform_C( CPoint &org ) void CWord::Transform_SSE2( CPoint &org )
{
+ // __m128 union data type currently not supported with Intel C++ Compiler, so just call C version
+#ifdef __ICL
+ Transform_C(org);
+#else
// SSE code
// speed up ~1.5-1.7x
double scalex = m_style.fontScaleX/100;
@@ -562,6 +566,7 @@ void CWord::Transform_SSE2( CPoint &org ) }
}
}
+#endif // __ICL
}
// CText
diff --git a/src/subtitles/RTS.h b/src/subtitles/RTS.h index 1f09ac0e7..0d1add191 100644 --- a/src/subtitles/RTS.h +++ b/src/subtitles/RTS.h @@ -219,8 +219,8 @@ public: CRect AllocRect(CSubtitle* s, int segment, int entry, int layer, int collisions);
};
-[uuid("537DCACA-2812-4a4f-B2C6-1A34C17ADEB0")]
-class CRenderedTextSubtitle : public CSimpleTextSubtitle, public ISubPicProviderImpl, public ISubStream
+class __declspec(uuid("537DCACA-2812-4a4f-B2C6-1A34C17ADEB0"))
+CRenderedTextSubtitle : public CSimpleTextSubtitle, public ISubPicProviderImpl, public ISubStream
{
CAtlMap<int, CSubtitle*> m_subtitleCache;
diff --git a/src/subtitles/RenderedHdmvSubtitle.h b/src/subtitles/RenderedHdmvSubtitle.h index 8b2c280a6..ef476ae52 100644 --- a/src/subtitles/RenderedHdmvSubtitle.h +++ b/src/subtitles/RenderedHdmvSubtitle.h @@ -29,8 +29,8 @@ #include "BaseSub.h"
-[uuid("FCA68599-C83E-4ea5-94A3-C2E1B0E326B9")]
-class CRenderedHdmvSubtitle : public ISubPicProviderImpl, public ISubStream
+class __declspec(uuid("FCA68599-C83E-4ea5-94A3-C2E1B0E326B9"))
+CRenderedHdmvSubtitle : public ISubPicProviderImpl, public ISubStream
{
public:
CRenderedHdmvSubtitle(CCritSec* pLock, SUBTITLE_TYPE nType);
diff --git a/src/subtitles/SSF.h b/src/subtitles/SSF.h index ac19b02f8..de76c06f8 100644 --- a/src/subtitles/SSF.h +++ b/src/subtitles/SSF.h @@ -29,8 +29,8 @@ namespace ssf
{
- [uuid("E0593632-0AB7-47CA-8BE1-E9D2A6A4825E")]
- class CRenderer : public ISubPicProviderImpl, public ISubStream
+ class __declspec(uuid("E0593632-0AB7-47CA-8BE1-E9D2A6A4825E"))
+CRenderer : public ISubPicProviderImpl, public ISubStream
{
CString m_fn, m_name;
CAutoPtr<SubtitleFile> m_file;
diff --git a/src/subtitles/SubtitleInputPin.cpp b/src/subtitles/SubtitleInputPin.cpp index dd96962bb..a315b3884 100644 --- a/src/subtitles/SubtitleInputPin.cpp +++ b/src/subtitles/SubtitleInputPin.cpp @@ -219,8 +219,8 @@ STDMETHODIMP CSubtitleInputPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME return __super::NewSegment(tStart, tStop, dRate);
}
-[uuid("D3D92BC3-713B-451B-9122-320095D51EA5")]
-interface IMpeg2DemultiplexerTesting : public IUnknown
+interface __declspec(uuid("D3D92BC3-713B-451B-9122-320095D51EA5"))
+IMpeg2DemultiplexerTesting : public IUnknown
{
STDMETHOD(GetMpeg2StreamType)(ULONG* plType) = NULL;
STDMETHOD(toto)() = NULL;
diff --git a/src/subtitles/VobSubFile.h b/src/subtitles/VobSubFile.h index a1a14c163..47af072eb 100644 --- a/src/subtitles/VobSubFile.h +++ b/src/subtitles/VobSubFile.h @@ -64,8 +64,8 @@ public: void SetAlignment(bool fAlign, int x, int y, int hor, int ver);
};
-[uuid("998D4C9A-460F-4de6-BDCD-35AB24F94ADF")]
-class CVobSubFile : public CVobSubSettings, public ISubStream, public ISubPicProviderImpl
+class __declspec(uuid("998D4C9A-460F-4de6-BDCD-35AB24F94ADF"))
+CVobSubFile : public CVobSubSettings, public ISubStream, public ISubPicProviderImpl
{
protected:
CString m_title;
@@ -143,8 +143,8 @@ public: STDMETHODIMP Reload();
};
-[uuid("D7FBFB45-2D13-494F-9B3D-FFC9557D5C45")]
-class CVobSubStream : public CVobSubSettings, public ISubStream, public ISubPicProviderImpl
+class __declspec(uuid("D7FBFB45-2D13-494F-9B3D-FFC9557D5C45"))
+CVobSubStream : public CVobSubSettings, public ISubStream, public ISubPicProviderImpl
{
CString m_name;
diff --git a/src/subtitles/VobSubFileRipper.h b/src/subtitles/VobSubFileRipper.h index fc5eecc0e..781917e22 100644 --- a/src/subtitles/VobSubFileRipper.h +++ b/src/subtitles/VobSubFileRipper.h @@ -93,8 +93,8 @@ typedef struct // IVSFRipperCallback
//
-[uuid("9E2EBB5C-AD7C-452f-A48B-38685716AC46")]
-interface IVSFRipperCallback : public IUnknown
+interface __declspec(uuid("9E2EBB5C-AD7C-452f-A48B-38685716AC46"))
+IVSFRipperCallback : public IUnknown
{
STDMETHOD (OnMessage) (LPCTSTR msg) PURE;
STDMETHOD (OnProgress) (double progress /*0->1*/) PURE;
@@ -131,8 +131,8 @@ public: // IVSFRipper
//
-[uuid("69F935BB-B8D0-43f5-AA2E-BBD0851CC9A6")]
-interface IVSFRipper : public IUnknown
+interface __declspec(uuid("69F935BB-B8D0-43f5-AA2E-BBD0851CC9A6"))
+IVSFRipper : public IUnknown
{
STDMETHOD (SetCallBack) (IVSFRipperCallback* pCallback) PURE;
STDMETHOD (LoadParamFile) (CString fn) PURE;
|