astyle formatting

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

1 files changed, 153 insertions, 153 deletions

diff --git a/src/apps/mplayerc/PPageWebServer.cpp b/src/apps/mplayerc/PPageWebServer.cpp
index e49165e5b..387e6044b 100644
--- a/src/apps/mplayerc/PPageWebServer.cpp
+++ b/src/apps/mplayerc/PPageWebServer.cpp
@@ -31,17 +31,17 @@
 

 IMPLEMENT_DYNAMIC(CPPageWebServer, CPPageBase)

 CPPageWebServer::CPPageWebServer()

-    : CPPageBase(CPPageWebServer::IDD, CPPageWebServer::IDD)

-    , m_fEnableWebServer(FALSE)

-    , m_nWebServerPort(0)

-    , m_launch(_T("http://localhost:13579/"))

-    , m_fWebServerPrintDebugInfo(FALSE)

-    , m_fWebServerUseCompression(FALSE)

-    , m_fWebRoot(FALSE)

-    , m_WebRoot(_T(""))

-    , m_fWebServerLocalhostOnly(FALSE)

-    , m_WebServerCGI(_T(""))

-    , m_WebDefIndex(_T(""))

+	: CPPageBase(CPPageWebServer::IDD, CPPageWebServer::IDD)

+	, m_fEnableWebServer(FALSE)

+	, m_nWebServerPort(0)

+	, m_launch(_T("http://localhost:13579/"))

+	, m_fWebServerPrintDebugInfo(FALSE)

+	, m_fWebServerUseCompression(FALSE)

+	, m_fWebRoot(FALSE)

+	, m_WebRoot(_T(""))

+	, m_fWebServerLocalhostOnly(FALSE)

+	, m_WebServerCGI(_T(""))

+	, m_WebDefIndex(_T(""))

 {

 }

 

@@ -51,164 +51,164 @@ CPPageWebServer::~CPPageWebServer()
 

 void CPPageWebServer::DoDataExchange(CDataExchange* pDX)

 {

-    __super::DoDataExchange(pDX);

-    DDX_Check(pDX, IDC_CHECK1, m_fEnableWebServer);

-    DDX_Text(pDX, IDC_EDIT1, m_nWebServerPort);

-    DDX_Control(pDX, IDC_EDIT1, m_nWebServerPortCtrl);

-    DDX_Control(pDX, IDC_STATIC1, m_launch);

-    DDX_Check(pDX, IDC_CHECK2, m_fWebServerPrintDebugInfo);

-    DDX_Check(pDX, IDC_CHECK3, m_fWebServerUseCompression);

-    DDX_Check(pDX, IDC_CHECK4, m_fWebRoot);

-    DDX_Text(pDX, IDC_EDIT2, m_WebRoot);

-    DDX_Check(pDX, IDC_CHECK5, m_fWebServerLocalhostOnly);

-    DDX_Text(pDX, IDC_EDIT3, m_WebServerCGI);

-    DDX_Text(pDX, IDC_EDIT9, m_WebDefIndex);

+	__super::DoDataExchange(pDX);

+	DDX_Check(pDX, IDC_CHECK1, m_fEnableWebServer);

+	DDX_Text(pDX, IDC_EDIT1, m_nWebServerPort);

+	DDX_Control(pDX, IDC_EDIT1, m_nWebServerPortCtrl);

+	DDX_Control(pDX, IDC_STATIC1, m_launch);

+	DDX_Check(pDX, IDC_CHECK2, m_fWebServerPrintDebugInfo);

+	DDX_Check(pDX, IDC_CHECK3, m_fWebServerUseCompression);

+	DDX_Check(pDX, IDC_CHECK4, m_fWebRoot);

+	DDX_Text(pDX, IDC_EDIT2, m_WebRoot);

+	DDX_Check(pDX, IDC_CHECK5, m_fWebServerLocalhostOnly);

+	DDX_Text(pDX, IDC_EDIT3, m_WebServerCGI);

+	DDX_Text(pDX, IDC_EDIT9, m_WebDefIndex);

 }

 

 BOOL CPPageWebServer::PreTranslateMessage(MSG* pMsg)

 {

-    if(pMsg->message == WM_LBUTTONDOWN && pMsg->hwnd == m_launch.m_hWnd)

-    {

-        UpdateData();

-

-        AppSettings& s = AfxGetAppSettings();

-

-        if(CMainFrame* pWnd = (CMainFrame*)AfxGetMainWnd())

-        {

-            if(m_fEnableWebServer)

-            {

-                if(s.nWebServerPort != m_nWebServerPort)

-                {

-                    AfxMessageBox(_T("Press apply first, before testing the new settings!"), MB_OK);

-                    return TRUE;

-                }

-            }

-        }

-    }

-

-    return CPPageBase::PreTranslateMessage(pMsg);

+	if(pMsg->message == WM_LBUTTONDOWN && pMsg->hwnd == m_launch.m_hWnd)

+	{

+		UpdateData();

+

+		AppSettings& s = AfxGetAppSettings();

+

+		if(CMainFrame* pWnd = (CMainFrame*)AfxGetMainWnd())

+		{

+			if(m_fEnableWebServer)

+			{

+				if(s.nWebServerPort != m_nWebServerPort)

+				{

+					AfxMessageBox(_T("Press apply first, before testing the new settings!"), MB_OK);

+					return TRUE;

+				}

+			}

+		}

+	}

+

+	return CPPageBase::PreTranslateMessage(pMsg);

 }

 

 BOOL CPPageWebServer::OnInitDialog()

 {

-    __super::OnInitDialog();

+	__super::OnInitDialog();

 

-    AppSettings& s = AfxGetAppSettings();

+	AppSettings& s = AfxGetAppSettings();

 

-    m_fEnableWebServer = s.fEnableWebServer;

-    m_nWebServerPort = s.nWebServerPort;

-    m_fWebServerPrintDebugInfo = s.fWebServerPrintDebugInfo;

-    m_fWebServerLocalhostOnly = s.fWebServerLocalhostOnly;

-    m_fWebServerUseCompression = s.fWebServerUseCompression;

-    m_fWebRoot = s.WebRoot.Find('*') < 0;

-    m_WebRoot = s.WebRoot;

-    m_WebRoot.TrimLeft(_T("*"));

-    m_WebDefIndex = s.WebDefIndex;

-    m_WebServerCGI = s.WebServerCGI;

+	m_fEnableWebServer = s.fEnableWebServer;

+	m_nWebServerPort = s.nWebServerPort;

+	m_fWebServerPrintDebugInfo = s.fWebServerPrintDebugInfo;

+	m_fWebServerLocalhostOnly = s.fWebServerLocalhostOnly;

+	m_fWebServerUseCompression = s.fWebServerUseCompression;

+	m_fWebRoot = s.WebRoot.Find('*') < 0;

+	m_WebRoot = s.WebRoot;

+	m_WebRoot.TrimLeft(_T("*"));

+	m_WebDefIndex = s.WebDefIndex;

+	m_WebServerCGI = s.WebServerCGI;

 

-    UpdateData(FALSE);

+	UpdateData(FALSE);

 

-    OnEnChangeEdit1();

+	OnEnChangeEdit1();

 

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

-    // EXCEPTION: OCX Property Pages should return FALSE

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

+	// EXCEPTION: OCX Property Pages should return FALSE

 }

 

 BOOL CPPageWebServer::OnApply()

 {

-    UpdateData();

-

-    AppSettings& s = AfxGetAppSettings();

-

-    CString NewWebRoot = m_WebRoot;

-    if(!m_fWebRoot) NewWebRoot = _T("*") + NewWebRoot;

-

-    bool fRestart = s.nWebServerPort != m_nWebServerPort

-                    || s.WebRoot != NewWebRoot || s.WebServerCGI != m_WebServerCGI;

-

-    s.fEnableWebServer = !!m_fEnableWebServer;

-    s.nWebServerPort = m_nWebServerPort;

-    s.fWebServerPrintDebugInfo = !!m_fWebServerPrintDebugInfo;

-    s.fWebServerLocalhostOnly = !!m_fWebServerLocalhostOnly;

-    s.fWebServerUseCompression = !!m_fWebServerUseCompression;

-    s.WebRoot = NewWebRoot;

-    s.WebDefIndex = m_WebDefIndex;

-    s.WebServerCGI = m_WebServerCGI;

-

-    if(CMainFrame* pWnd = (CMainFrame*)AfxGetMainWnd())

-    {

-        if(m_fEnableWebServer)

-        {

-            if(fRestart) pWnd->StopWebServer();

-            pWnd->StartWebServer(m_nWebServerPort);

-        }

-        else

-        {

-            pWnd->StopWebServer();

-        }

-    }

-

-    return __super::OnApply();

+	UpdateData();

+

+	AppSettings& s = AfxGetAppSettings();

+

+	CString NewWebRoot = m_WebRoot;

+	if(!m_fWebRoot) NewWebRoot = _T("*") + NewWebRoot;

+

+	bool fRestart = s.nWebServerPort != m_nWebServerPort

+					|| s.WebRoot != NewWebRoot || s.WebServerCGI != m_WebServerCGI;

+

+	s.fEnableWebServer = !!m_fEnableWebServer;

+	s.nWebServerPort = m_nWebServerPort;

+	s.fWebServerPrintDebugInfo = !!m_fWebServerPrintDebugInfo;

+	s.fWebServerLocalhostOnly = !!m_fWebServerLocalhostOnly;

+	s.fWebServerUseCompression = !!m_fWebServerUseCompression;

+	s.WebRoot = NewWebRoot;

+	s.WebDefIndex = m_WebDefIndex;

+	s.WebServerCGI = m_WebServerCGI;

+

+	if(CMainFrame* pWnd = (CMainFrame*)AfxGetMainWnd())

+	{

+		if(m_fEnableWebServer)

+		{

+			if(fRestart) pWnd->StopWebServer();

+			pWnd->StartWebServer(m_nWebServerPort);

+		}

+		else

+		{

+			pWnd->StopWebServer();

+		}

+	}

+

+	return __super::OnApply();

 }

 

 CString CPPageWebServer::GetMPCDir()

 {

-    CString dir;

-    GetModuleFileName(AfxGetInstanceHandle(), dir.GetBuffer(MAX_PATH), MAX_PATH);

-    dir.ReleaseBuffer();

-    CPath path(dir);

-    path.RemoveFileSpec();

-    return (LPCTSTR)path;

+	CString dir;

+	GetModuleFileName(AfxGetInstanceHandle(), dir.GetBuffer(MAX_PATH), MAX_PATH);

+	dir.ReleaseBuffer();

+	CPath path(dir);

+	path.RemoveFileSpec();

+	return (LPCTSTR)path;

 }

 

 CString CPPageWebServer::GetCurWebRoot()

 {

-    CString WebRoot;

-    GetDlgItem(IDC_EDIT2)->GetWindowText(WebRoot);

-    WebRoot.Replace('/', '\\');

+	CString WebRoot;

+	GetDlgItem(IDC_EDIT2)->GetWindowText(WebRoot);

+	WebRoot.Replace('/', '\\');

 

-    CPath path;

-    path.Combine(GetMPCDir(), WebRoot);

-    return path.IsDirectory() ? (LPCTSTR)path : _T("");

+	CPath path;

+	path.Combine(GetMPCDir(), WebRoot);

+	return path.IsDirectory() ? (LPCTSTR)path : _T("");

 }

 

 static int __stdcall BrowseCtrlCallback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)

 {

-    if(uMsg == BFFM_INITIALIZED && lpData)

-        ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);

-    return 0;

+	if(uMsg == BFFM_INITIALIZED && lpData)

+		::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);

+	return 0;

 }

 

 bool CPPageWebServer::PickDir(CString& dir)

 {

-    TCHAR buff[_MAX_PATH];

-

-    BROWSEINFO bi;

-    bi.hwndOwner = m_hWnd;

-    bi.pidlRoot = NULL;

-    bi.pszDisplayName = buff;

-    bi.lpszTitle = ResStr(IDS_PPAGEWEBSERVER_0);

-    bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_VALIDATE | BIF_USENEWUI;

-    bi.lpfn = BrowseCtrlCallback;

-    bi.lParam = (LPARAM)(LPCTSTR)dir;

-    bi.iImage = 0;

-

-    LPITEMIDLIST iil = SHBrowseForFolder(&bi);

-    if(iil)

-    {

-        SHGetPathFromIDList(iil, buff);

-        dir = buff;

-        return true;

-    }

-

-    return false;

+	TCHAR buff[_MAX_PATH];

+

+	BROWSEINFO bi;

+	bi.hwndOwner = m_hWnd;

+	bi.pidlRoot = NULL;

+	bi.pszDisplayName = buff;

+	bi.lpszTitle = ResStr(IDS_PPAGEWEBSERVER_0);

+	bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_VALIDATE | BIF_USENEWUI;

+	bi.lpfn = BrowseCtrlCallback;

+	bi.lParam = (LPARAM)(LPCTSTR)dir;

+	bi.iImage = 0;

+

+	LPITEMIDLIST iil = SHBrowseForFolder(&bi);

+	if(iil)

+	{

+		SHGetPathFromIDList(iil, buff);

+		dir = buff;

+		return true;

+	}

+

+	return false;

 }

 

 BEGIN_MESSAGE_MAP(CPPageWebServer, CPPageBase)

-    ON_EN_CHANGE(IDC_EDIT1, OnEnChangeEdit1)

-    ON_BN_CLICKED(IDC_BUTTON1, OnBnClickedButton1)

-    ON_BN_CLICKED(IDC_BUTTON2, OnBnClickedButton2)

-    ON_UPDATE_COMMAND_UI(IDC_BUTTON1, OnUpdateButton2)

+	ON_EN_CHANGE(IDC_EDIT1, OnEnChangeEdit1)

+	ON_BN_CLICKED(IDC_BUTTON1, OnBnClickedButton1)

+	ON_BN_CLICKED(IDC_BUTTON2, OnBnClickedButton2)

+	ON_UPDATE_COMMAND_UI(IDC_BUTTON1, OnUpdateButton2)

 END_MESSAGE_MAP()

 

 

@@ -217,39 +217,39 @@ END_MESSAGE_MAP()
 

 void CPPageWebServer::OnEnChangeEdit1()

 {

-    UpdateData();

+	UpdateData();

 

-    CString link;

-    link.Format(_T("http://localhost:%d/"), m_nWebServerPort);

-    m_launch.m_link = link;

+	CString link;

+	link.Format(_T("http://localhost:%d/"), m_nWebServerPort);

+	m_launch.m_link = link;

 

-    SetModified();

+	SetModified();

 }

 

 void CPPageWebServer::OnBnClickedButton1()

 {

-    CString dir = GetCurWebRoot();

-    if(PickDir(dir))

-    {

-        CPath path;

-        if(path.RelativePathTo(GetMPCDir(), FILE_ATTRIBUTE_DIRECTORY, dir, FILE_ATTRIBUTE_DIRECTORY))

-            dir = (LPCTSTR)path;

-        m_WebRoot = dir;

-        UpdateData(FALSE);

-    }

+	CString dir = GetCurWebRoot();

+	if(PickDir(dir))

+	{

+		CPath path;

+		if(path.RelativePathTo(GetMPCDir(), FILE_ATTRIBUTE_DIRECTORY, dir, FILE_ATTRIBUTE_DIRECTORY))

+			dir = (LPCTSTR)path;

+		m_WebRoot = dir;

+		UpdateData(FALSE);

+	}

 }

 

 void CPPageWebServer::OnBnClickedButton2()

 {

-    CString dir;

-    if(PickDir(dir))

-    {

-        dir += _T("\\");

-        CWebServer::Deploy(dir);

-    }

+	CString dir;

+	if(PickDir(dir))

+	{

+		dir += _T("\\");

+		CWebServer::Deploy(dir);

+	}

 }

 

 void CPPageWebServer::OnUpdateButton2(CCmdUI* pCmdUI)

 {

-    pCmdUI->Enable(GetDlgItem(IDC_EDIT2)->GetWindowTextLength() > 0);

+	pCmdUI->Enable(GetDlgItem(IDC_EDIT2)->GetWindowTextLength() > 0);

 }