Style patch part1. based on newly released astyle 1.24.

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

1 files changed, 53 insertions, 50 deletions

diff --git a/src/apps/mplayerc/PlayerSubresyncBar.h b/src/apps/mplayerc/PlayerSubresyncBar.h
index e9ecdaba7..ef806bdea 100644
--- a/src/apps/mplayerc/PlayerSubresyncBar.h
+++ b/src/apps/mplayerc/PlayerSubresyncBar.h
@@ -33,83 +33,86 @@
 

 class CPlayerSubresyncBar : public CSizingControlBarG

 {

-	DECLARE_DYNAMIC(CPlayerSubresyncBar)

+    DECLARE_DYNAMIC(CPlayerSubresyncBar)

 

 private:

-	CPlayerListCtrl m_list;

+    CPlayerListCtrl m_list;

 

-	CFont m_font;

+    CFont m_font;

 

     CCritSec* m_pSubLock;

-	CComPtr<ISubStream> m_pSubStream;

+    CComPtr<ISubStream> m_pSubStream;

 

-	int m_lastSegment;

-	__int64 m_rt;

+    int m_lastSegment;

+    __int64 m_rt;

 

-	enum 

-	{

-		// TEXTSUB

-		COL_START=0, COL_END, COL_PREVSTART, COL_PREVEND, COL_TEXT, COL_STYLE, COL_FONT, COL_CHARSET, COL_UNICODE, COL_LAYER, COL_ACTOR, COL_EFFECT,

-		// VOBSUB

-		/* ........... same as TEXTSUB ............. */	  COL_VOBID=COL_TEXT, COL_CELLID, COL_FORCED,

-	};

+    enum

+    {

+        // TEXTSUB

+        COL_START=0, COL_END, COL_PREVSTART, COL_PREVEND, COL_TEXT, COL_STYLE, COL_FONT, COL_CHARSET, COL_UNICODE, COL_LAYER, COL_ACTOR, COL_EFFECT,

+        // VOBSUB

+        /* ........... same as TEXTSUB ............. */	  COL_VOBID=COL_TEXT, COL_CELLID, COL_FORCED,

+    };

 

-	enum {NONE = 0, VOBSUB, TEXTSUB};

-	int m_mode;

+    enum {NONE = 0, VOBSUB, TEXTSUB};

+    int m_mode;

 

-	bool m_fUnlink;

+    bool m_fUnlink;

 

-	typedef struct {int orgstart, newstart, orgend, newend;} SubTime;

-	CAtlArray<SubTime> m_subtimes;

+    typedef struct

+    {

+        int orgstart, newstart, orgend, newend;

+    } SubTime;

+    CAtlArray<SubTime> m_subtimes;

 

 //	CRenderedTextSubtitle m_sts;

-	CSimpleTextSubtitle m_sts;

+    CSimpleTextSubtitle m_sts;

 

-	int GetStartTime(int iItem), GetEndTime(int iItem);

-	void FormatTime(int iItem, TCHAR* buff, int time /* 0:start, 1:newstart, 2:preview */, bool fEnd);

+    int GetStartTime(int iItem), GetEndTime(int iItem);

+    void FormatTime(int iItem, TCHAR* buff, int time /* 0:start, 1:newstart, 2:preview */, bool fEnd);

 

-	void UpdatePreview(), UpdateStrings();

+    void UpdatePreview(), UpdateStrings();

 

-	enum {TSMOD=1, TEMOD=2, TSADJ=4, TEADJ=8, TSEP=0x80000000};

+    enum {TSMOD=1, TEMOD=2, TSADJ=4, TEADJ=8, TSEP=0x80000000};

 

-	void GetCheck(int iItem, bool& fStartMod, bool& fEndMod, bool& fStartAdj, bool& fEndAdj);

-	void SetCheck(int iItem, bool fStart, bool fEnd);

+    void GetCheck(int iItem, bool& fStartMod, bool& fEndMod, bool& fStartAdj, bool& fEndAdj);

+    void SetCheck(int iItem, bool fStart, bool fEnd);

 

-	bool ModStart(int iItem, int t, bool fReset = false);

-	bool ModEnd(int iItem, int t, bool fReset = false);

+    bool ModStart(int iItem, int t, bool fReset = false);

+    bool ModEnd(int iItem, int t, bool fReset = false);

 

 public:

-	CPlayerSubresyncBar();

-	virtual ~CPlayerSubresyncBar();

+    CPlayerSubresyncBar();

+    virtual ~CPlayerSubresyncBar();

 

-	BOOL Create(CWnd* pParentWnd, CCritSec* pSubLock);

+    BOOL Create(CWnd* pParentWnd, CCritSec* pSubLock);

 

-	void SetTime(__int64 rt);

+    void SetTime(__int64 rt);

 

-	void SetSubtitle(ISubStream* pSubStream, double fps);

-	void ResetSubtitle();

-	void SaveSubtitle();

+    void SetSubtitle(ISubStream* pSubStream, double fps);

+    void ResetSubtitle();

+    void SaveSubtitle();

 

-	int FindNearestSub(__int64& rtPos, bool bForward);

-	bool ShiftSubtitle(int nItem, long lValue, __int64& rtPos);

-	bool SaveToDisk();

+    int FindNearestSub(__int64& rtPos, bool bForward);

+    bool ShiftSubtitle(int nItem, long lValue, __int64& rtPos);

+    bool SaveToDisk();

 

 

 protected:

-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);

-	virtual BOOL PreTranslateMessage(MSG* pMsg);

-	

-	bool IsShortCut(MSG* pMsg);

+    virtual BOOL PreCreateWindow(CREATESTRUCT& cs);

+    virtual BOOL PreTranslateMessage(MSG* pMsg);

 

-	DECLARE_MESSAGE_MAP()

+    bool IsShortCut(MSG* pMsg);

+

+    DECLARE_MESSAGE_MAP()

 

 public:

-	afx_msg void OnSize(UINT nType, int cx, int cy);

-	afx_msg void OnBeginlabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnDolabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnEndlabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnRclickList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnNMDblclkList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnLvnKeydownList(NMHDR* pNMHDR, LRESULT* pResult);

-	afx_msg void OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnSize(UINT nType, int cx, int cy);

+    afx_msg void OnBeginlabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnDolabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnEndlabeleditList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnRclickList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnNMDblclkList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnLvnKeydownList(NMHDR* pNMHDR, LRESULT* pResult);

+    afx_msg void OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult);

 };