diff options
author | Underground78 <underground78@users.sourceforge.net> | 2012-06-19 20:52:43 +0400 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2012-06-19 20:52:43 +0400 |
commit | 4b0eca5c675a124db1265a90ba94ea690811af80 (patch) | |
tree | 5419f7d6e79a0efffdc20122ca1a70e9ebefb0c3 | |
parent | 62d725da6faf1863c6c2116cec51f0e269b90a7a (diff) |
Cosmetics: Apply AStyle on the files modified/added at r5190.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5197 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | src/mpc-hc/FileAssoc.cpp | 44 | ||||
-rw-r--r-- | src/mpc-hc/FileAssoc.h | 6 | ||||
-rw-r--r-- | src/mpc-hc/mplayerc.cpp | 6 |
3 files changed, 28 insertions, 28 deletions
diff --git a/src/mpc-hc/FileAssoc.cpp b/src/mpc-hc/FileAssoc.cpp index 181b4cedf..9c80008db 100644 --- a/src/mpc-hc/FileAssoc.cpp +++ b/src/mpc-hc/FileAssoc.cpp @@ -108,7 +108,7 @@ CString CFileAssoc::GetEnqueueCommand() IApplicationAssociationRegistration* CFileAssoc::CreateRegistrationManager()
{
- IApplicationAssociationRegistration *pAAR = NULL;
+ IApplicationAssociationRegistration* pAAR = NULL;
// Default manager (requires at least Vista)
HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
@@ -461,7 +461,7 @@ bool CFileAssoc::AreRegisteredFileContextMenuEntries(CString strExt) return registered;
}
-bool CFileAssoc::Register(CMediaFormatCategory &mfc, bool bRegister, bool bRegisterContextMenuEntries, bool bAssociatedWithIcon)
+bool CFileAssoc::Register(CMediaFormatCategory& mfc, bool bRegister, bool bRegisterContextMenuEntries, bool bAssociatedWithIcon)
{
CAtlList<CString> exts;
ExplodeMin(mfc.GetExtsWithPeriod(), exts, ' ');
@@ -477,7 +477,7 @@ bool CFileAssoc::Register(CMediaFormatCategory &mfc, bool bRegister, bool bRegis return res;
}
-CFileAssoc::reg_state_t CFileAssoc::IsRegistered(CMediaFormatCategory &mfc)
+CFileAssoc::reg_state_t CFileAssoc::IsRegistered(CMediaFormatCategory& mfc)
{
CAtlList<CString> exts;
ExplodeMin(mfc.GetExtsWithPeriod(), exts, ' ');
@@ -503,7 +503,7 @@ CFileAssoc::reg_state_t CFileAssoc::IsRegistered(CMediaFormatCategory &mfc) return res;
}
-CFileAssoc::reg_state_t CFileAssoc::AreRegisteredFileContextMenuEntries(CMediaFormatCategory &mfc)
+CFileAssoc::reg_state_t CFileAssoc::AreRegisteredFileContextMenuEntries(CMediaFormatCategory& mfc)
{
CAtlList<CString> exts;
ExplodeMin(mfc.GetExtsWithPeriod(), exts, ' ');
@@ -578,7 +578,7 @@ bool CFileAssoc::AreRegisteredFolderContextMenuEntries() registered = (strOpenCommand.CompareNoCase(CString(buff)) == 0);
}
}
-
+
return registered;
}
@@ -614,15 +614,15 @@ void CFileAssoc::RegisterAutoPlay(autoplay_t ap, bool bRegister) key.Close();
if (ERROR_SUCCESS != key.Create(HKEY_CLASSES_ROOT,
- CString(CStringA("MediaPlayerClassic.Autorun\\Shell\\Play") + handlers[i].verb + "\\Command"))) {
- return;
+ CString(CStringA("MediaPlayerClassic.Autorun\\Shell\\Play") + handlers[i].verb + "\\Command"))) {
+ return;
}
key.SetStringValue(NULL, _T("\"") + exe + _T("\"") + handlers[i].cmd);
key.Close();
if (ERROR_SUCCESS != key.Create(HKEY_LOCAL_MACHINE,
- CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\Handlers\\MPCPlay") + handlers[i].verb + "OnArrival"))) {
- return;
+ CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\Handlers\\MPCPlay") + handlers[i].verb + "OnArrival"))) {
+ return;
}
key.SetStringValue(_T("Action"), ResStr(handlers[i].action));
key.SetStringValue(_T("Provider"), _T("Media Player Classic"));
@@ -632,15 +632,15 @@ void CFileAssoc::RegisterAutoPlay(autoplay_t ap, bool bRegister) key.Close();
if (ERROR_SUCCESS != key.Create(HKEY_LOCAL_MACHINE,
- CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"))) {
- return;
+ CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"))) {
+ return;
}
key.SetStringValue(CString(CStringA("MPCPlay") + handlers[i].verb + "OnArrival"), _T(""));
key.Close();
} else {
if (ERROR_SUCCESS != key.Create(HKEY_LOCAL_MACHINE,
- CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"))) {
- return;
+ CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"))) {
+ return;
}
key.DeleteValue(CString(CStringA("MPCPlay") + handlers[i].verb + "OnArrival"));
key.Close();
@@ -664,22 +664,22 @@ bool CFileAssoc::IsAutoPlayRegistered(autoplay_t ap) CRegKey key;
if (ERROR_SUCCESS != key.Open(HKEY_LOCAL_MACHINE,
- CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"),
- KEY_READ)) {
- return false;
+ CString(CStringA("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\AutoplayHandlers\\EventHandlers\\Play") + handlers[i].verb + "OnArrival"),
+ KEY_READ)) {
+ return false;
}
len = _countof(buff);
if (ERROR_SUCCESS != key.QueryStringValue(
- CString(_T("MPCPlay")) + handlers[i].verb + _T("OnArrival"),
- buff, &len)) {
- return false;
+ CString(_T("MPCPlay")) + handlers[i].verb + _T("OnArrival"),
+ buff, &len)) {
+ return false;
}
key.Close();
if (ERROR_SUCCESS != key.Open(HKEY_CLASSES_ROOT,
- CString(CStringA("MediaPlayerClassic.Autorun\\Shell\\Play") + handlers[i].verb + "\\Command"),
- KEY_READ)) {
- return false;
+ CString(CStringA("MediaPlayerClassic.Autorun\\Shell\\Play") + handlers[i].verb + "\\Command"),
+ KEY_READ)) {
+ return false;
}
len = _countof(buff);
if (ERROR_SUCCESS != key.QueryStringValue(NULL, buff, &len)) {
diff --git a/src/mpc-hc/FileAssoc.h b/src/mpc-hc/FileAssoc.h index 61daa592d..04ae9798d 100644 --- a/src/mpc-hc/FileAssoc.h +++ b/src/mpc-hc/FileAssoc.h @@ -57,9 +57,9 @@ public: static bool IsRegistered(CString ext);
static bool AreRegisteredFileContextMenuEntries(CString strExt);
- static bool Register(CMediaFormatCategory &mfc, bool bRegister, bool bRegisterContextMenuEntries, bool bAssociatedWithIcon);
- static reg_state_t IsRegistered(CMediaFormatCategory &mfc);
- static reg_state_t AreRegisteredFileContextMenuEntries(CMediaFormatCategory &mfc);
+ static bool Register(CMediaFormatCategory& mfc, bool bRegister, bool bRegisterContextMenuEntries, bool bAssociatedWithIcon);
+ static reg_state_t IsRegistered(CMediaFormatCategory& mfc);
+ static reg_state_t AreRegisteredFileContextMenuEntries(CMediaFormatCategory& mfc);
static bool RegisterFolderContextMenuEntries(bool bRegister);
static bool AreRegisteredFolderContextMenuEntries();
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index 4d835488a..6c43fc70d 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -941,9 +941,9 @@ BOOL CMPlayerCApp::InitInstance() bAudioOnly = mf[i].IsAudioOnly();
if (((m_s.nCLSwitches & CLSW_REGEXTVID) && !bAudioOnly) ||
- ((m_s.nCLSwitches & CLSW_REGEXTAUD) && bAudioOnly) ||
- ((m_s.nCLSwitches & CLSW_REGEXTPL) && bPlaylist)) {
- CFileAssoc::Register(mf[i], true, false, true);
+ ((m_s.nCLSwitches & CLSW_REGEXTAUD) && bAudioOnly) ||
+ ((m_s.nCLSwitches & CLSW_REGEXTPL) && bPlaylist)) {
+ CFileAssoc::Register(mf[i], true, false, true);
}
}
|