revert r1783

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

1 files changed, 51 insertions, 51 deletions

diff --git a/src/subtitles/RealTextParser.h b/src/subtitles/RealTextParser.h
index a297914f5..06247e430 100644
--- a/src/subtitles/RealTextParser.h
+++ b/src/subtitles/RealTextParser.h
@@ -24,79 +24,79 @@ using std::towlower;
 class CRealTextParser

 {

 public:

-    CRealTextParser();

-    virtual ~CRealTextParser(void);

+	CRealTextParser();

+	virtual ~CRealTextParser(void);

 

-    struct Tag

-    {

-        Tag(): m_bOpen(false), m_bClose(false), m_bComment(false), m_bText(false) {}

+	struct Tag

+	{

+		Tag(): m_bOpen(false), m_bClose(false), m_bComment(false), m_bText(false) {}

 

-        wstring m_szName;

+		wstring m_szName;

 

-        bool m_bOpen;

-        bool m_bClose;

+		bool m_bOpen;

+		bool m_bClose;

 

-        bool m_bComment;

-        bool m_bText;

+		bool m_bComment;

+		bool m_bText;

 

-        map<wstring, wstring> m_mapAttributes;

-    };

+		map<wstring, wstring> m_mapAttributes;

+	};

 

-    struct Subtitles

-    {

-        Subtitles(): m_WindowTag(), m_FontTag(), m_bCenter(false) {}

+	struct Subtitles

+	{

+		Subtitles(): m_WindowTag(), m_FontTag(), m_bCenter(false) {}

 

-        Tag m_WindowTag;

-        Tag m_FontTag;

+		Tag m_WindowTag;

+		Tag m_FontTag;

 

-        bool m_bCenter;

+		bool m_bCenter;

 

-        map<pair<int, int>, wstring> m_mapLines;

-    };

+		map<pair<int, int>, wstring> m_mapLines;

+	};

 

-    bool ParseRealText(wstring p_szFile);

+	bool ParseRealText(wstring p_szFile);

 

-    const Subtitles& GetParsedSubtitles();

+	const Subtitles& GetParsedSubtitles();

 

-    bool OutputSRT(wostream& p_rOutput);

+	bool OutputSRT(wostream& p_rOutput);

 

 private:

-    bool ExtractTag(wstring& p_rszLine, Tag& p_rTag);

-    bool ExtractTextTag(wstring& p_rszLine, Tag& p_rTag);

-    bool ExtractString(wstring& p_rszLine, wstring& p_rszString);

-    bool SkipSpaces(wstring& p_rszLine, unsigned int& p_riPos);

-    bool GetString(wstring& p_rszLine, unsigned int& p_riPos, wstring& p_rszString, const wstring& p_crszEndChars);

-    bool GetAttributes(wstring& p_rszLine, unsigned int& p_riPos, map<wstring, wstring>& p_rmapAttributes);

+	bool ExtractTag(wstring& p_rszLine, Tag& p_rTag);

+	bool ExtractTextTag(wstring& p_rszLine, Tag& p_rTag);

+	bool ExtractString(wstring& p_rszLine, wstring& p_rszString);

+	bool SkipSpaces(wstring& p_rszLine, unsigned int& p_riPos);

+	bool GetString(wstring& p_rszLine, unsigned int& p_riPos, wstring& p_rszString, const wstring& p_crszEndChars);

+	bool GetAttributes(wstring& p_rszLine, unsigned int& p_riPos, map<wstring, wstring>& p_rmapAttributes);

 

-    int GetTimecode(const wstring& p_crszTimecode);

-    wstring FormatTimecode(int iTimecode,

-                           int iMillisecondPrecision = 3,

-                           bool p_bPadZeroes = true,

-                           const wstring& p_crszSeparator = L":",

-                           const wstring& p_crszMillisecondSeparator = L".");

+	int GetTimecode(const wstring& p_crszTimecode);

+	wstring FormatTimecode(int iTimecode,

+		int iMillisecondPrecision = 3,

+		bool p_bPadZeroes = true,

+		const wstring& p_crszSeparator = L":",

+		const wstring& p_crszMillisecondSeparator = L".");

 

-    wstring StringToLower(const wstring& p_crszString);

+	wstring StringToLower(const wstring& p_crszString);

 

-    wstring RenderTags(const list<Tag>& p_crlTags);

+	wstring RenderTags(const list<Tag>& p_crlTags);

 

-    void PopTag(list<Tag>& p_rlistTags, const wstring& p_crszTagName);

+	void PopTag(list<Tag>& p_rlistTags, const wstring& p_crszTagName);

 

-    // Filter out for example multiple font tags opened previously (font tags are not always terminated properly in realtext and can build up)

-    void FilterReduntantTags(list<Tag>& p_rlistTags);

+	// Filter out for example multiple font tags opened previously (font tags are not always terminated properly in realtext and can build up)

+	void FilterReduntantTags(list<Tag>& p_rlistTags);

 

+	

+	Subtitles m_RealText;

 

-    Subtitles m_RealText;

+	bool m_bIgnoreFont;

+	bool m_bIgnoreFontSize;

+	bool m_bIgnoreFontColor;

+	bool m_bIgnoreFontWeight;

+	bool m_bIgnoreFontFace;

 

-    bool m_bIgnoreFont;

-    bool m_bIgnoreFontSize;

-    bool m_bIgnoreFontColor;

-    bool m_bIgnoreFontWeight;

-    bool m_bIgnoreFontFace;

+	int m_iMinFontSize;

+	int m_iMaxFontSize;

 

-    int m_iMinFontSize;

-    int m_iMaxFontSize;

+	int m_iDefaultSubtitleDurationInMillisecs;

 

-    int m_iDefaultSubtitleDurationInMillisecs;

-

-    bool m_bTryToIgnoreErrors;

+	bool m_bTryToIgnoreErrors;

 };