Merged VSFilterMod rev20, only 64 bit code enabled for the time being

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1688 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 15 insertions, 2 deletions

diff --git a/src/subtitles/RTS.h b/src/subtitles/RTS.h
index 6b48f4cf8..9f9afcae7 100644
--- a/src/subtitles/RTS.h
+++ b/src/subtitles/RTS.h
@@ -128,9 +128,15 @@ public:
 

 	void Compact();

 

+#ifdef _VSMOD // patch m006. moveable vector clip

+	CRect PaintShadow(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha, MOD_MOVEVC& mod_vc, REFERENCE_TIME rt);

+	CRect PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha, MOD_MOVEVC& mod_vc, REFERENCE_TIME rt);

+	CRect PaintBody(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha, MOD_MOVEVC& mod_vc, REFERENCE_TIME rt);

+#else

 	CRect PaintShadow(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha);

 	CRect PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha);

 	CRect PaintBody(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha);

+#endif

 };

 

 enum eftype

@@ -140,9 +146,16 @@ enum eftype
 	EF_FADE,		// {\fade(a1=param[0], a2=param[1], a3=param[2], t1=t[0], t2=t[1], t3=t[2], t4=t[3])} or {\fad(t1=t[1], t2=t[2])

 	EF_BANNER,		// Banner;delay=param[0][;lefttoright=param[1];fadeawaywidth=param[2]]

 	EF_SCROLL,		// Scroll up/down=param[3];top=param[0];bottom=param[1];delay=param[2][;fadeawayheight=param[4]]

+#ifdef _VSMOD // patch m006. moveable vector clip

+	EF_VECTCLP

+#endif

 };

 

-#define EF_NUMBEROFEFFECTS 5

+#ifdef _VSMOD // patch m006. moveable vector clip

+	#define EF_NUMBEROFEFFECTS 6

+#else

+	#define EF_NUMBEROFEFFECTS 5

+#endif

 

 class Effect

 {

@@ -224,7 +237,6 @@ class CRenderedTextSubtitle : public CSimpleTextSubtitle, public ISubPicProvider
 	STSStyle *m_pStyleOverride; // the app can decide to use this style instead of a built-in one

 	bool m_doOverrideStyle;

 

-

 	void ParseEffect(CSubtitle* sub, CString str);

 	void ParseString(CSubtitle* sub, CStringW str, STSStyle& style);

 	void ParsePolygon(CSubtitle* sub, CStringW str, STSStyle& style);

@@ -244,6 +256,7 @@ public:
 

 	virtual void Copy(CSimpleTextSubtitle& sts);

 	virtual void Empty();

+

 	// call to signal this RTS to ignore any of the styles and apply the given override style

 	void SetOverride(bool doOverride = true, STSStyle *styleOverride = NULL) { m_doOverrideStyle = doOverride; if(styleOverride != NULL) m_pStyleOverride = styleOverride; }