diff options
author | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-05-24 02:23:54 +0400 |
---|---|---|
committer | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-05-24 02:23:54 +0400 |
commit | 7bffd4d229181b4a0ef55ad918bc9c31ceac605f (patch) | |
tree | 1cae7e57eceb0e02950fc639b87753f61d037dfd /src/filters/transform/vsfilter | |
parent | 4e5b4e90f3651089dcc7d0697c768593242e9403 (diff) |
Fixed some Intel C++ compiler errors, 32-bit MPC-HC can be compiled but the compiled exe has problems similar to vs2010 builds. We do not support the intel compiler, but patches are welcome. (thanks for the python script, Marko - really helped)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1933 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/vsfilter')
-rw-r--r-- | src/filters/transform/vsfilter/DirectVobSubFilter.h | 8 | ||||
-rw-r--r-- | src/filters/transform/vsfilter/DirectVobSubPropPage.h | 32 | ||||
-rw-r--r-- | src/filters/transform/vsfilter/IDirectVobSub.h | 16 |
3 files changed, 28 insertions, 28 deletions
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
|