apply astyle formatting

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

1 files changed, 40 insertions, 28 deletions

diff --git a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.cpp b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.cpp
index cf56cd629..cf5bc2a91 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.cpp
+++ b/src/filters/transform/MpaDecFilter/MpaDecSettingsWnd.cpp
@@ -48,9 +48,13 @@ bool CMpaDecSettingsWnd::OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>
 	m_pMDF.Release();

 

 	POSITION pos = pUnks.GetHeadPosition();

-	while(pos && !(m_pMDF = pUnks.GetNext(pos)));

+	while(pos && !(m_pMDF = pUnks.GetNext(pos))) {

+		;

+	}

 

-	if(!m_pMDF) return false;

+	if(!m_pMDF) {

+		return false;

+	}

 

 	m_outputformat = m_pMDF->GetSampleFormat();

 	m_ac3spkcfg = m_pMDF->GetSpeakerConfig(IMpaDecFilter::ac3);

@@ -70,18 +74,17 @@ void CMpaDecSettingsWnd::OnDisconnect()
 

 LPCTSTR CMpaDecSettingsWnd::GetDolbyMode (DolbyDigitalMode ddmode)

 {

-	switch (ddmode)

-	{

-	case DD_AC3 :

-		return _T(" (AC3)");

-	case DD_EAC3 :

-		return _T(" (Dolby Digital Plus)");

-	case DD_TRUEHD :

-		return _T(" (Dolby True HD)");

-	case DD_MLP	:

-		return _T(" (MLP)");

-	default :

-		return _T("");

+	switch (ddmode) {

+		case DD_AC3 :

+			return _T(" (AC3)");

+		case DD_EAC3 :

+			return _T(" (Dolby Digital Plus)");

+		case DD_TRUEHD :

+			return _T(" (Dolby True HD)");

+		case DD_MLP	:

+			return _T(" (MLP)");

+		default :

+			return _T("");

 	}

 }

 

@@ -105,8 +108,9 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_outputformat_combo.SetCurSel(0);

 

 	for(int i = 0; i < m_outputformat_combo.GetCount(); i++)

-		if((int)m_outputformat_combo.GetItemData(i) == m_outputformat)

+		if((int)m_outputformat_combo.GetItemData(i) == m_outputformat) {

 			m_outputformat_combo.SetCurSel(i);

+		}

 

 	p.y += 30;

 

@@ -130,8 +134,9 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_ac3spkcfg_combo.SetItemData(m_ac3spkcfg_combo.AddString(ResStr(IDS_MPA_CHANNEL_2)), A52_CHANNEL2);

 

 	for(int i = 0, sel = abs(m_ac3spkcfg) & A52_CHANNEL_MASK; i < m_ac3spkcfg_combo.GetCount(); i++)

-		if((int)m_ac3spkcfg_combo.GetItemData(i) == sel)

+		if((int)m_ac3spkcfg_combo.GetItemData(i) == sel) {

 			m_ac3spkcfg_combo.SetCurSel(i);

+		}

 

 	m_ac3spkcfg_combo.GetWindowRect(r);

 	ScreenToClient(r);

@@ -139,8 +144,7 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_ac3lfe_check.Create(_T("LFE"), dwStyle|BS_AUTOCHECKBOX, CRect(CPoint(r.left, r.bottom + 3), CSize(50, m_fontheight)), this, IDC_PP_CHECK4);

 	m_ac3lfe_check.SetCheck(!!(abs(m_ac3spkcfg) & A52_LFE));

 

-	for(int i = 0, h = max(20, m_fontheight)+1; i < countof(m_ac3spkcfg_radio); i++, p.y += h)

-	{

+	for(int i = 0, h = max(20, m_fontheight)+1; i < countof(m_ac3spkcfg_radio); i++, p.y += h) {

 		static const TCHAR* labels[] = {m_strDecodeToSpeaker, _T("SPDIF")};

 		m_ac3spkcfg_radio[i].Create(labels[i], dwStyle|BS_AUTORADIOBUTTON|(i == 0 ? WS_GROUP : 0), CRect(p + CPoint(10, 0), CSize(140, h)), this, IDC_PP_RADIO1+i);

 	}

@@ -171,8 +175,9 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_dtsspkcfg_combo.SetItemData(m_dtsspkcfg_combo.AddString(ResStr(IDS_MPA_3F_2R)), DTS_3F2R);

 

 	for(int i = 0, sel = abs(m_dtsspkcfg) & DTS_CHANNEL_MASK; i < m_dtsspkcfg_combo.GetCount(); i++)

-		if((int)m_dtsspkcfg_combo.GetItemData(i) == sel)

+		if((int)m_dtsspkcfg_combo.GetItemData(i) == sel) {

 			m_dtsspkcfg_combo.SetCurSel(i);

+		}

 

 	m_dtsspkcfg_combo.GetWindowRect(r);

 	ScreenToClient(r);

@@ -180,8 +185,7 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_dtslfe_check.Create(_T("LFE"), dwStyle|BS_AUTOCHECKBOX, CRect(CPoint(r.left, r.bottom + 3), CSize(50, m_fontheight)), this, IDC_PP_CHECK5);

 	m_dtslfe_check.SetCheck(!!(abs(m_dtsspkcfg) & DTS_LFE));

 

-	for(int i = 0, h = max(20, m_fontheight)+1; i < countof(m_dtsspkcfg_radio); i++, p.y += h)

-	{

+	for(int i = 0, h = max(20, m_fontheight)+1; i < countof(m_dtsspkcfg_radio); i++, p.y += h) {

 		static const TCHAR* labels[] = {m_strDecodeToSpeaker, _T("SPDIF")};

 		m_dtsspkcfg_radio[i].Create(labels[i], dwStyle|BS_AUTORADIOBUTTON|(i == 0 ? WS_GROUP : 0), CRect(p + CPoint(10, 0), CSize(140, h)), this, IDC_PP_RADIO3+i);

 	}

@@ -202,8 +206,9 @@ bool CMpaDecSettingsWnd::OnActivate()
 	m_aacdownmix_check.Create(ResStr(IDS_MPADECSETTINGSWND_12), dwStyle|BS_AUTOCHECKBOX, CRect(p + CPoint(10, 0), CSize(150, m_fontheight)), this, IDC_PP_CHECK3);

 	m_aacdownmix_check.SetCheck(m_aacdownmix);

 

-	for(CWnd* pWnd = GetWindow(GW_CHILD); pWnd; pWnd = pWnd->GetNextWindow())

+	for(CWnd* pWnd = GetWindow(GW_CHILD); pWnd; pWnd = pWnd->GetNextWindow()) {

 		pWnd->SetFont(&m_font, FALSE);

+	}

 

 	return true;

 }

@@ -212,12 +217,20 @@ void CMpaDecSettingsWnd::OnDeactivate()
 {

 	m_outputformat = m_outputformat_combo.GetItemData(m_outputformat_combo.GetCurSel());

 	m_ac3spkcfg = m_ac3spkcfg_combo.GetItemData(m_ac3spkcfg_combo.GetCurSel());

-	if(!!m_ac3lfe_check.GetCheck()) m_ac3spkcfg |= A52_LFE;

-	if(IsDlgButtonChecked(IDC_PP_RADIO2)) m_ac3spkcfg = -m_ac3spkcfg;

+	if(!!m_ac3lfe_check.GetCheck()) {

+		m_ac3spkcfg |= A52_LFE;

+	}

+	if(IsDlgButtonChecked(IDC_PP_RADIO2)) {

+		m_ac3spkcfg = -m_ac3spkcfg;

+	}

 	m_ac3drc = !!m_ac3spkcfg_check.GetCheck();

 	m_dtsspkcfg = m_dtsspkcfg_combo.GetItemData(m_dtsspkcfg_combo.GetCurSel());

-	if(!!m_dtslfe_check.GetCheck()) m_dtsspkcfg |= DTS_LFE;

-	if(IsDlgButtonChecked(IDC_PP_RADIO4)) m_dtsspkcfg = -m_dtsspkcfg;

+	if(!!m_dtslfe_check.GetCheck()) {

+		m_dtsspkcfg |= DTS_LFE;

+	}

+	if(IsDlgButtonChecked(IDC_PP_RADIO4)) {

+		m_dtsspkcfg = -m_dtsspkcfg;

+	}

 	m_dtsdrc = !!m_dtsspkcfg_check.GetCheck();

 	m_aacdownmix = !!m_aacdownmix_check.GetCheck();

 }

@@ -226,8 +239,7 @@ bool CMpaDecSettingsWnd::OnApply()
 {

 	OnDeactivate();

 

-	if(m_pMDF)

-	{

+	if(m_pMDF) {

 		m_pMDF->SetSampleFormat((MPCSampleFormat)m_outputformat);

 		m_pMDF->SetSpeakerConfig(IMpaDecFilter::ac3, m_ac3spkcfg);

 		m_pMDF->SetDynamicRangeControl(IMpaDecFilter::ac3, m_ac3drc);