revert r1783

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

1 files changed, 105 insertions, 105 deletions

diff --git a/src/apps/mplayerc/PPageCasimir.cpp b/src/apps/mplayerc/PPageCasimir.cpp
index 81abe1916..67a00182c 100644
--- a/src/apps/mplayerc/PPageCasimir.cpp
+++ b/src/apps/mplayerc/PPageCasimir.cpp
@@ -33,7 +33,7 @@
 

 IMPLEMENT_DYNAMIC(CPPageCasimir, CPPageBase)

 CPPageCasimir::CPPageCasimir()

-    : CPPageBase(CPPageCasimir::IDD, CPPageCasimir::IDD)

+	: CPPageBase(CPPageCasimir::IDD, CPPageCasimir::IDD)

 {

 }

 

@@ -43,17 +43,17 @@ CPPageCasimir::~CPPageCasimir()
 

 void CPPageCasimir::DoDataExchange(CDataExchange* pDX)

 {

-    __super::DoDataExchange(pDX);

-    DDX_Control(pDX, IDC_SLI_CONTRAST, m_SliContrast);

-    DDX_Control(pDX, IDC_SLI_BRIGHTNESS, m_SliBrightness);

-    DDX_Control(pDX, IDC_SLI_HUE, m_SliHue);

-    DDX_Control(pDX, IDC_SLI_SATURATION, m_SliSaturation);

+	__super::DoDataExchange(pDX);

+	DDX_Control(pDX, IDC_SLI_CONTRAST, m_SliContrast);

+	DDX_Control(pDX, IDC_SLI_BRIGHTNESS, m_SliBrightness);

+	DDX_Control(pDX, IDC_SLI_HUE, m_SliHue);

+	DDX_Control(pDX, IDC_SLI_SATURATION, m_SliSaturation);

 }

 

 

 BEGIN_MESSAGE_MAP(CPPageCasimir, CPPageBase)

-    ON_WM_HSCROLL()

-    ON_BN_CLICKED(IDC_RESET, OnBnClickedReset)

+	ON_WM_HSCROLL()

+	ON_BN_CLICKED(IDC_RESET, OnBnClickedReset)

 END_MESSAGE_MAP()

 

 

@@ -61,126 +61,126 @@ END_MESSAGE_MAP()
 

 BOOL CPPageCasimir::OnInitDialog()

 {

-    COLORPROPERTY_RANGE*	ControlRange;

-    __super::OnInitDialog();

-

-    AppSettings& s = AfxGetAppSettings();

-

-    UpdateData(FALSE);

-

-    CreateToolTip();

-

-    ControlRange = AfxGetMyApp()->GetColorControl(Contrast);

-    if(ControlRange)

-    {

-        m_dContrast		= s.dContrast;

-        m_SliContrast.EnableWindow(TRUE);

-        m_SliContrast.SetRange((int)ControlRange->MinValue * 100, (int)ControlRange->MaxValue * 100);

-        m_SliContrast.SetTicFreq((int)(ControlRange->MaxValue - ControlRange->MinValue) * 10);

-        m_SliContrast.SetPos((int)(m_dContrast * 100));

-    }

-

-    ControlRange = AfxGetMyApp()->GetColorControl(Brightness);

-    if(ControlRange)

-    {

-        m_dBrightness = s.dBrightness;

-        m_SliBrightness.EnableWindow(TRUE);

-        m_SliBrightness.SetRange((int)ControlRange->MinValue, (int)ControlRange->MaxValue);

-        m_SliBrightness.SetTicFreq((int)(ControlRange->MaxValue - ControlRange->MinValue) / 10);

-        m_SliBrightness.SetPos((int)m_dBrightness);

-    }

-

-    ControlRange = AfxGetMyApp()->GetColorControl(Hue);

-    if(ControlRange)

-    {

-        m_dHue		= s.dHue;

-        m_SliHue.EnableWindow(TRUE);

-        m_SliHue.SetRange((int)ControlRange->MinValue, (int)ControlRange->MaxValue);

-        m_SliHue.SetTicFreq((int)(ControlRange->MaxValue - ControlRange->MinValue) / 10);

-        m_SliHue.SetPos((int)m_dHue);

-    }

-

-    ControlRange = AfxGetMyApp()->GetColorControl(Saturation);

-    if(ControlRange)

-    {

-        m_dSaturation	= s.dSaturation;

-        m_SliSaturation.EnableWindow(TRUE);

-        m_SliSaturation.SetRange((int)ControlRange->MinValue * 100, (int)ControlRange->MaxValue * 100);

-        m_SliSaturation.SetTicFreq((int)(ControlRange->MaxValue - ControlRange->MinValue) * 10);

-        m_SliSaturation.SetPos((int)(m_dSaturation * 100));

-    }

-

-    return TRUE;

+	COLORPROPERTY_RANGE*	ControlRange;

+	__super::OnInitDialog();

+

+	AppSettings& s = AfxGetAppSettings();

+

+	UpdateData(FALSE);

+

+	CreateToolTip();

+

+	ControlRange = AfxGetMyApp()->GetColorControl (Contrast);

+	if (ControlRange)

+	{

+		m_dContrast		= s.dContrast;

+		m_SliContrast.EnableWindow (TRUE);

+		m_SliContrast.SetRange		((int)ControlRange->MinValue*100, (int)ControlRange->MaxValue*100);

+		m_SliContrast.SetTicFreq	((int)(ControlRange->MaxValue - ControlRange->MinValue) * 10);

+		m_SliContrast.SetPos		((int)(m_dContrast*100));

+	}

+

+	ControlRange = AfxGetMyApp()->GetColorControl (Brightness);

+	if (ControlRange)

+	{

+		m_dBrightness = s.dBrightness;

+		m_SliBrightness.EnableWindow (TRUE);

+		m_SliBrightness.SetRange	((int)ControlRange->MinValue, (int)ControlRange->MaxValue);

+		m_SliBrightness.SetTicFreq	((int)(ControlRange->MaxValue - ControlRange->MinValue) / 10);

+		m_SliBrightness.SetPos		((int)m_dBrightness);

+	}

+

+	ControlRange = AfxGetMyApp()->GetColorControl (Hue);

+	if (ControlRange)

+	{

+		m_dHue		= s.dHue;

+		m_SliHue.EnableWindow (TRUE);

+		m_SliHue.SetRange	((int)ControlRange->MinValue, (int)ControlRange->MaxValue);

+		m_SliHue.SetTicFreq	((int)(ControlRange->MaxValue - ControlRange->MinValue) / 10);

+		m_SliHue.SetPos		((int)m_dHue);

+	}

+

+	ControlRange = AfxGetMyApp()->GetColorControl (Saturation);

+	if (ControlRange)

+	{

+		m_dSaturation	= s.dSaturation;

+		m_SliSaturation.EnableWindow (TRUE);

+		m_SliSaturation.SetRange	((int)ControlRange->MinValue*100, (int)ControlRange->MaxValue*100);

+		m_SliSaturation.SetTicFreq	((int)(ControlRange->MaxValue - ControlRange->MinValue) * 10);

+		m_SliSaturation.SetPos		((int)(m_dSaturation*100));

+	}

+

+	return TRUE;

 }

 

 BOOL CPPageCasimir::OnApply()

 {

-    UpdateData();

+	UpdateData();

 

-    AppSettings& s = AfxGetAppSettings();

+	AppSettings& s = AfxGetAppSettings();

 

-    s.dBrightness				= m_dBrightness;

-    s.dContrast					= m_dContrast;

-    s.dHue						= m_dHue;

-    s.dSaturation				= m_dSaturation;

+	s.dBrightness				= m_dBrightness;

+	s.dContrast					= m_dContrast;

+	s.dHue						= m_dHue;

+	s.dSaturation				= m_dSaturation;

 

-    return __super::OnApply();

+	return __super::OnApply();

 }

 

 

 void CPPageCasimir::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)

 {

-    if(*pScrollBar == m_SliContrast)

-    {

-        UpdateData();

-        m_dContrast = (float)(m_SliContrast.GetPos() / 100.0);

-    }

-    else if(*pScrollBar == m_SliBrightness)

-    {

-        UpdateData();

-        m_dBrightness = (float)m_SliBrightness.GetPos();

-    }

-    else if(*pScrollBar == m_SliHue)

-    {

-        UpdateData();

-        m_dHue = (float)m_SliHue.GetPos();

-    }

-    else if(*pScrollBar == m_SliSaturation)

-    {

-        UpdateData();

-        m_dSaturation = (float)(m_SliSaturation.GetPos() / 100.0);

-    }

-

-    SetModified();

-

-    ((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(m_dBrightness, m_dContrast, m_dHue, m_dSaturation);

-

-    __super::OnHScroll(nSBCode, nPos, pScrollBar);

+	if(*pScrollBar == m_SliContrast)

+	{

+		UpdateData();

+		m_dContrast = (float)(m_SliContrast.GetPos()/100.0);

+	}

+	else if(*pScrollBar == m_SliBrightness)

+	{

+		UpdateData();

+		m_dBrightness = (float)m_SliBrightness.GetPos();

+	}

+	else if(*pScrollBar == m_SliHue)

+	{

+		UpdateData();

+		m_dHue = (float)m_SliHue.GetPos();

+	}

+	else if(*pScrollBar == m_SliSaturation)

+	{

+		UpdateData();

+		m_dSaturation = (float)(m_SliSaturation.GetPos()/100.0);

+	}

+

+	SetModified();

+

+	((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(m_dBrightness, m_dContrast, m_dHue, m_dSaturation);

+

+	__super::OnHScroll(nSBCode, nPos, pScrollBar);

 }

 

 void CPPageCasimir::OnBnClickedReset()

 {

-    AppSettings& s = AfxGetAppSettings();

+	AppSettings& s = AfxGetAppSettings();

 

-    UpdateData(FALSE);

+	UpdateData(FALSE);

 

-    m_dContrast		= AfxGetMyApp()->GetColorControl(Contrast)->DefaultValue;

-    m_dBrightness	= AfxGetMyApp()->GetColorControl(Brightness)->DefaultValue;

-    m_dHue			= AfxGetMyApp()->GetColorControl(Hue)->DefaultValue;

-    m_dSaturation	= AfxGetMyApp()->GetColorControl(Saturation)->DefaultValue;

+	m_dContrast		= AfxGetMyApp()->GetColorControl (Contrast)->DefaultValue;

+	m_dBrightness	= AfxGetMyApp()->GetColorControl (Brightness)->DefaultValue;

+	m_dHue			= AfxGetMyApp()->GetColorControl (Hue)->DefaultValue;

+	m_dSaturation	= AfxGetMyApp()->GetColorControl (Saturation)->DefaultValue;

 

-    m_SliContrast.SetPos((int)m_dContrast * 100);

-    m_SliBrightness.SetPos((int)m_dBrightness);

-    m_SliHue.SetPos((int)m_dHue);

-    m_SliSaturation.SetPos((int)m_dSaturation * 100);

+	m_SliContrast.SetPos	((int)m_dContrast*100);

+	m_SliBrightness.SetPos	((int)m_dBrightness);

+	m_SliHue.SetPos			((int)m_dHue);

+	m_SliSaturation.SetPos	((int)m_dSaturation*100);

 

-    ((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(m_dBrightness, m_dContrast, m_dHue, m_dSaturation);

+	((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(m_dBrightness, m_dContrast, m_dHue, m_dSaturation);

 }

 

 void CPPageCasimir::OnCancel()

 {

-    AppSettings& s = AfxGetAppSettings();

+	AppSettings& s = AfxGetAppSettings();

 

-    ((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(s.dBrightness, s.dContrast, s.dHue, s.dSaturation);

-    __super::OnCancel();

+	((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetVMR9ColorControl(s.dBrightness, s.dContrast, s.dHue, s.dSaturation);

+	__super::OnCancel();

 }