astyle formatting

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

1 files changed, 132 insertions, 132 deletions

diff --git a/src/apps/mplayerc/PPageSubtitles.cpp b/src/apps/mplayerc/PPageSubtitles.cpp
index d5db3c103..67b6725fc 100644
--- a/src/apps/mplayerc/PPageSubtitles.cpp
+++ b/src/apps/mplayerc/PPageSubtitles.cpp
@@ -31,14 +31,14 @@
 

 IMPLEMENT_DYNAMIC(CPPageSubtitles, CPPageBase)

 CPPageSubtitles::CPPageSubtitles()

-    : CPPageBase(CPPageSubtitles::IDD, CPPageSubtitles::IDD)

-    , m_fOverridePlacement(FALSE)

-    , m_nHorPos(0)

-    , m_nVerPos(0)

-    , m_nSPCSize(0)

-    , m_fSPCPow2Tex(FALSE)

-    , m_fSPCAllowAnimationWhenBuffering(TRUE)

-    , m_nSubDelayInterval(0)

+	: CPPageBase(CPPageSubtitles::IDD, CPPageSubtitles::IDD)

+	, m_fOverridePlacement(FALSE)

+	, m_nHorPos(0)

+	, m_nVerPos(0)

+	, m_nSPCSize(0)

+	, m_fSPCPow2Tex(FALSE)

+	, m_fSPCAllowAnimationWhenBuffering(TRUE)

+	, m_nSubDelayInterval(0)

 {

 }

 

@@ -48,33 +48,33 @@ CPPageSubtitles::~CPPageSubtitles()
 

 void CPPageSubtitles::DoDataExchange(CDataExchange* pDX)

 {

-    __super::DoDataExchange(pDX);

-    DDX_Check(pDX, IDC_CHECK3, m_fOverridePlacement);

-    DDX_Text(pDX, IDC_EDIT2, m_nHorPos);

-    DDX_Control(pDX, IDC_SPIN2, m_nHorPosCtrl);

-    DDX_Text(pDX, IDC_EDIT3, m_nVerPos);

-    DDX_Control(pDX, IDC_SPIN3, m_nVerPosCtrl);

-    DDX_Text(pDX, IDC_EDIT1, m_nSPCSize);

-    DDX_Control(pDX, IDC_SPIN1, m_nSPCSizeCtrl);

-    DDX_Control(pDX, IDC_COMBO1, m_spmaxres);

-    DDX_Control(pDX, IDC_EDIT2, m_nHorPosEdit);

-    DDX_Control(pDX, IDC_EDIT3, m_nVerPosEdit);

-    DDX_Check(pDX, IDC_CHECK_SPCPOW2TEX, m_fSPCPow2Tex);

-    DDX_Check(pDX, IDC_CHECK_SPCANIMWITHBUFFER, m_fSPCAllowAnimationWhenBuffering);

-    DDX_Text(pDX, IDC_EDIT4, m_nSubDelayInterval);

+	__super::DoDataExchange(pDX);

+	DDX_Check(pDX, IDC_CHECK3, m_fOverridePlacement);

+	DDX_Text(pDX, IDC_EDIT2, m_nHorPos);

+	DDX_Control(pDX, IDC_SPIN2, m_nHorPosCtrl);

+	DDX_Text(pDX, IDC_EDIT3, m_nVerPos);

+	DDX_Control(pDX, IDC_SPIN3, m_nVerPosCtrl);

+	DDX_Text(pDX, IDC_EDIT1, m_nSPCSize);

+	DDX_Control(pDX, IDC_SPIN1, m_nSPCSizeCtrl);

+	DDX_Control(pDX, IDC_COMBO1, m_spmaxres);

+	DDX_Control(pDX, IDC_EDIT2, m_nHorPosEdit);

+	DDX_Control(pDX, IDC_EDIT3, m_nVerPosEdit);

+	DDX_Check(pDX, IDC_CHECK_SPCPOW2TEX, m_fSPCPow2Tex);

+	DDX_Check(pDX, IDC_CHECK_SPCANIMWITHBUFFER, m_fSPCAllowAnimationWhenBuffering);

+	DDX_Text(pDX, IDC_EDIT4, m_nSubDelayInterval);

 }

 

 

 BEGIN_MESSAGE_MAP(CPPageSubtitles, CPPageBase)

-    ON_UPDATE_COMMAND_UI(IDC_EDIT2, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_SPIN2, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_EDIT3, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_SPIN3, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_STATIC1, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_STATIC2, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_STATIC3, OnUpdatePosOverride)

-    ON_UPDATE_COMMAND_UI(IDC_STATIC4, OnUpdatePosOverride)

-    ON_EN_CHANGE(IDC_EDIT4, OnSubDelayInterval)

+	ON_UPDATE_COMMAND_UI(IDC_EDIT2, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_SPIN2, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_EDIT3, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_SPIN3, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_STATIC1, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_STATIC2, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_STATIC3, OnUpdatePosOverride)

+	ON_UPDATE_COMMAND_UI(IDC_STATIC4, OnUpdatePosOverride)

+	ON_EN_CHANGE(IDC_EDIT4, OnSubDelayInterval)

 END_MESSAGE_MAP()

 

 

@@ -82,127 +82,127 @@ END_MESSAGE_MAP()
 

 int TranslateResIn(int _In)

 {

-    switch (_In)

-    {

-    case 0:

-        return 0;

-    case 1:

-    case 2:

-    case 3:

-    case 4:

-    case 5:

-        return _In + 4;

-    case 6:

-    case 7:

-    case 8:

-    case 9:

-        return _In - 5;

-    }

-    return _In;

+	switch (_In)

+	{

+	case 0:

+		return 0;

+	case 1:

+	case 2:

+	case 3:

+	case 4:

+	case 5:

+		return _In + 4;

+	case 6:

+	case 7:

+	case 8:

+	case 9:

+		return _In - 5;

+	}

+	return _In;

 }

 

 int TranslateResOut(int _In)

 {

-    switch (_In)

-    {

-    case 0:

-        return 0;

-    case 1:

-    case 2:

-    case 3:

-    case 4:

-        return _In + 5;

-    case 5:

-    case 6:

-    case 7:

-    case 8:

-    case 9:

-        return _In - 4;

-    }

-    return _In;

+	switch (_In)

+	{

+	case 0:

+		return 0;

+	case 1:

+	case 2:

+	case 3:

+	case 4:

+		return _In + 5;

+	case 5:

+	case 6:

+	case 7:

+	case 8:

+	case 9:

+		return _In - 4;

+	}

+	return _In;

 }

 

 BOOL CPPageSubtitles::OnInitDialog()

 {

-    __super::OnInitDialog();

-

-    SetHandCursor(m_hWnd, IDC_COMBO1);

-

-    AppSettings& s = AfxGetAppSettings();

-

-    m_fOverridePlacement = s.fOverridePlacement;

-    m_nHorPos = s.nHorPos;

-    m_nHorPosCtrl.SetRange(-10,110);

-    m_nVerPos = s.nVerPos;

-    m_nVerPosCtrl.SetRange(110,-10);

-    m_nSPCSize = s.m_RenderersSettings.nSPCSize;

-    m_nSPCSizeCtrl.SetRange(0, 60);

-    m_spmaxres.AddString(_T("Desktop"));

-    m_spmaxres.AddString(_T("2560x1600"));

-    m_spmaxres.AddString(_T("1920x1080"));

-    m_spmaxres.AddString(_T("1320x900"));

-    m_spmaxres.AddString(_T("1280x720"));

-    m_spmaxres.AddString(_T("1024x768"));

-    m_spmaxres.AddString(_T("800x600"));

-    m_spmaxres.AddString(_T("640x480"));

-    m_spmaxres.AddString(_T("512x384"));

-    m_spmaxres.AddString(_T("384x288"));

-    m_spmaxres.SetCurSel(TranslateResIn(s.m_RenderersSettings.nSPCMaxRes));

-    m_fSPCPow2Tex = s.m_RenderersSettings.fSPCPow2Tex;

-    m_fSPCAllowAnimationWhenBuffering = s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering;

-    m_nSubDelayInterval = s.nSubDelayInterval;

-

-    UpdateData(FALSE);

-

-    CreateToolTip();

-

-    return TRUE;  // return TRUE unless you set the focus to a control

-    // EXCEPTION: OCX Property Pages should return FALSE

+	__super::OnInitDialog();

+

+	SetHandCursor(m_hWnd, IDC_COMBO1);

+

+	AppSettings& s = AfxGetAppSettings();

+

+	m_fOverridePlacement = s.fOverridePlacement;

+	m_nHorPos = s.nHorPos;

+	m_nHorPosCtrl.SetRange(-10,110);

+	m_nVerPos = s.nVerPos;

+	m_nVerPosCtrl.SetRange(110,-10);

+	m_nSPCSize = s.m_RenderersSettings.nSPCSize;

+	m_nSPCSizeCtrl.SetRange(0, 60);

+	m_spmaxres.AddString(_T("Desktop"));

+	m_spmaxres.AddString(_T("2560x1600"));

+	m_spmaxres.AddString(_T("1920x1080"));

+	m_spmaxres.AddString(_T("1320x900"));

+	m_spmaxres.AddString(_T("1280x720"));

+	m_spmaxres.AddString(_T("1024x768"));

+	m_spmaxres.AddString(_T("800x600"));

+	m_spmaxres.AddString(_T("640x480"));

+	m_spmaxres.AddString(_T("512x384"));

+	m_spmaxres.AddString(_T("384x288"));

+	m_spmaxres.SetCurSel(TranslateResIn(s.m_RenderersSettings.nSPCMaxRes));

+	m_fSPCPow2Tex = s.m_RenderersSettings.fSPCPow2Tex;

+	m_fSPCAllowAnimationWhenBuffering = s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering;

+	m_nSubDelayInterval = s.nSubDelayInterval;

+

+	UpdateData(FALSE);

+

+	CreateToolTip();

+

+	return TRUE;  // return TRUE unless you set the focus to a control

+	// EXCEPTION: OCX Property Pages should return FALSE

 }

 

 BOOL CPPageSubtitles::OnApply()

 {

-    UpdateData();

-

-    AppSettings& s = AfxGetAppSettings();

-

-    if(s.fOverridePlacement != !!m_fOverridePlacement

-       || s.nHorPos != m_nHorPos

-       || s.nVerPos != m_nVerPos

-       || s.m_RenderersSettings.nSPCSize != m_nSPCSize

-       || s.nSubDelayInterval != m_nSubDelayInterval

-       || s.m_RenderersSettings.nSPCMaxRes != TranslateResOut(m_spmaxres.GetCurSel())

-       || s.m_RenderersSettings.fSPCPow2Tex != !!m_fSPCPow2Tex

-       || s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering != !!m_fSPCAllowAnimationWhenBuffering)

-    {

-        s.fOverridePlacement = !!m_fOverridePlacement;

-        s.nHorPos = m_nHorPos;

-        s.nVerPos = m_nVerPos;

-        s.m_RenderersSettings.nSPCSize = m_nSPCSize;

-        s.nSubDelayInterval = m_nSubDelayInterval;

-        s.m_RenderersSettings.nSPCMaxRes = TranslateResOut(m_spmaxres.GetCurSel());

-        s.m_RenderersSettings.fSPCPow2Tex = !!m_fSPCPow2Tex;

-        s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering = !!m_fSPCAllowAnimationWhenBuffering;

-

-        if(CMainFrame* pFrame = (CMainFrame*)GetParentFrame())

-            pFrame->UpdateSubtitle(true);

-    }

-

-    return __super::OnApply();

+	UpdateData();

+

+	AppSettings& s = AfxGetAppSettings();

+

+	if(s.fOverridePlacement != !!m_fOverridePlacement

+		|| s.nHorPos != m_nHorPos

+		|| s.nVerPos != m_nVerPos

+		|| s.m_RenderersSettings.nSPCSize != m_nSPCSize

+		|| s.nSubDelayInterval != m_nSubDelayInterval

+		|| s.m_RenderersSettings.nSPCMaxRes != TranslateResOut(m_spmaxres.GetCurSel())

+		|| s.m_RenderersSettings.fSPCPow2Tex != !!m_fSPCPow2Tex

+		|| s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering != !!m_fSPCAllowAnimationWhenBuffering)

+	{

+		s.fOverridePlacement = !!m_fOverridePlacement;

+		s.nHorPos = m_nHorPos;

+		s.nVerPos = m_nVerPos;

+		s.m_RenderersSettings.nSPCSize = m_nSPCSize;

+		s.nSubDelayInterval = m_nSubDelayInterval;

+		s.m_RenderersSettings.nSPCMaxRes = TranslateResOut(m_spmaxres.GetCurSel());

+		s.m_RenderersSettings.fSPCPow2Tex = !!m_fSPCPow2Tex;

+		s.m_RenderersSettings.fSPCAllowAnimationWhenBuffering = !!m_fSPCAllowAnimationWhenBuffering;

+

+		if(CMainFrame* pFrame = (CMainFrame*)GetParentFrame())

+			pFrame->UpdateSubtitle(true);

+	}

+

+	return __super::OnApply();

 }

 

 void CPPageSubtitles::OnUpdatePosOverride(CCmdUI* pCmdUI)

 {

-    UpdateData();

-    pCmdUI->Enable(m_fOverridePlacement);

+	UpdateData();

+	pCmdUI->Enable(m_fOverridePlacement);

 }

 

 

 void CPPageSubtitles::OnSubDelayInterval()

 {

-    // If incorrect number, revert modifications

-    if (!UpdateData())

-        UpdateData(FALSE);

+	// If incorrect number, revert modifications

+	if (!UpdateData())

+		UpdateData(FALSE);

 

-    SetModified();

+	SetModified();

 }