revert r1783

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

1 files changed, 19 insertions, 22 deletions

diff --git a/src/subtitles/CCDecoder.h b/src/subtitles/CCDecoder.h
index 1d9dac1e9..5733de9ca 100644
--- a/src/subtitles/CCDecoder.h
+++ b/src/subtitles/CCDecoder.h
@@ -1,4 +1,4 @@
-/*

+/* 

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *

+ *   

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *

+ *   

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */

@@ -25,27 +25,24 @@
 

 class CCDecoder

 {

-    CSimpleTextSubtitle m_sts;

-    CString m_fn, m_rawfn;

-    __int64 m_time;

-    bool m_fEndOfCaption;

-    WCHAR m_buff[16][33], m_disp[16][33];

-    CPoint m_cursor;

+	CSimpleTextSubtitle m_sts;

+	CString m_fn, m_rawfn;

+	__int64 m_time;

+	bool m_fEndOfCaption;

+	WCHAR m_buff[16][33], m_disp[16][33];

+	CPoint m_cursor;

 

-    void SaveDisp(__int64 time);

-    void MoveCursor(int x, int y);

-    void OffsetCursor(int x, int y);

-    void PutChar(WCHAR c);

+	void SaveDisp(__int64 time);

+	void MoveCursor(int x, int y);

+	void OffsetCursor(int x, int y);

+	void PutChar(WCHAR c);

 

 public:

-    CCDecoder(CString fn = _T(""), CString rawfn = _T(""));

-    virtual ~CCDecoder();

-    void DecodeCC(BYTE* buff, int len, __int64 time);

-    void ExtractCC(BYTE* buff, int len, __int64 time);

-    CSimpleTextSubtitle& GetSTS()

-    {

-        return m_sts;

-    }

+	CCDecoder(CString fn = _T(""), CString rawfn = _T(""));

+	virtual ~CCDecoder();

+	void DecodeCC(BYTE* buff, int len, __int64 time);

+	void ExtractCC(BYTE* buff, int len, __int64 time);

+	CSimpleTextSubtitle& GetSTS() {return m_sts;}

 };