diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-11 02:27:44 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-11 02:27:44 +0300 |
commit | 40ef3d7dca836296365b5e88037f7e00d023c782 (patch) | |
tree | fb14081a5b07200ecb5fe29ba71cb15055e8e856 | |
parent | 370423a2f6cb42886b80f8ec395a816cd3b5a7a3 (diff) |
applied astyle formatting
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2763 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | src/apps/mplayerc/AppSettings.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/ChildView.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/FGManager.cpp | 128 | ||||
-rw-r--r-- | src/apps/mplayerc/FGManagerBDA.cpp | 16 | ||||
-rw-r--r-- | src/apps/mplayerc/FGManagerBDA.h | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/FilterEnum.h | 8 | ||||
-rw-r--r-- | src/apps/mplayerc/ISDb.h | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/LcdSupport.cpp | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/MainFrm.cpp | 48 | ||||
-rw-r--r-- | src/apps/mplayerc/MediaFormats.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/Mpeg2SectionData.cpp | 8 | ||||
-rw-r--r-- | src/apps/mplayerc/OpenDlg.cpp | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/OpenFileDlg.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/PlayerCaptureDialog.cpp | 26 | ||||
-rw-r--r-- | src/apps/mplayerc/PlayerNavigationDialog.cpp | 2 |
15 files changed, 130 insertions, 130 deletions
diff --git a/src/apps/mplayerc/AppSettings.cpp b/src/apps/mplayerc/AppSettings.cpp index 1a4156358..cce0cd28e 100644 --- a/src/apps/mplayerc/AppSettings.cpp +++ b/src/apps/mplayerc/AppSettings.cpp @@ -1434,7 +1434,7 @@ void CAppSettings::UpdateRenderersData(bool fSave) pApp->WriteProfileString(IDS_R_SETTINGS, IDS_D3D9RENDERDEVICE, r.D3D9RenderDevice);
}
- else
+ else
{
r.iAPSurfaceUsage = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_APSURACEFUSAGE, (IsVistaOrAbove() ? VIDRNDT_AP_TEXTURE3D : VIDRNDT_AP_TEXTURE2D));
// fVMRSyncFix = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_VMRSYNCFIX, FALSE);
diff --git a/src/apps/mplayerc/ChildView.cpp b/src/apps/mplayerc/ChildView.cpp index 1c21e0529..ee2cd068f 100644 --- a/src/apps/mplayerc/ChildView.cpp +++ b/src/apps/mplayerc/ChildView.cpp @@ -93,7 +93,7 @@ BOOL CChildView::PreTranslateMessage(MSG* pMsg) }
*/
if((pMsg->message == WM_LBUTTONDOWN || pMsg->message == WM_LBUTTONUP || pMsg->message == WM_MOUSEMOVE)
- && fInteractiveVideo)
+ && fInteractiveVideo)
{
if(pMsg->message == WM_MOUSEMOVE)
{
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index 313618672..48ef8d438 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -548,11 +548,11 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) HRESULT hr;
if(S_OK != IsPinDirection(pPinOut, PINDIR_OUTPUT)
- || pPinIn && S_OK != IsPinDirection(pPinIn, PINDIR_INPUT))
+ || pPinIn && S_OK != IsPinDirection(pPinIn, PINDIR_INPUT))
return VFW_E_INVALID_DIRECTION;
if(S_OK == IsPinConnected(pPinOut)
- || pPinIn && S_OK == IsPinConnected(pPinIn))
+ || pPinIn && S_OK == IsPinConnected(pPinIn))
return VFW_E_ALREADY_CONNECTED;
bool fDeadEnd = true;
@@ -611,12 +611,12 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) BeginEnumFilters(this, pEF, pBF)
{
if(pPinIn && GetFilterFromPin(pPinIn) == pBF
- || GetFilterFromPin(pPinOut) == pBF)
+ || GetFilterFromPin(pPinOut) == pBF)
continue;
// HACK: ffdshow - audio capture filter
if(GetCLSID(pPinOut) == GUIDFromCString(_T("{04FE9017-F873-410E-871E-AB91661A4EF7}"))
- && GetCLSID(pBF) == GUIDFromCString(_T("{E30629D2-27E5-11CE-875D-00608CB78066}")))
+ && GetCLSID(pBF) == GUIDFromCString(_T("{E30629D2-27E5-11CE-875D-00608CB78066}")))
continue;
pBFs.AddTail(pBF);
@@ -666,10 +666,10 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) CComPtr<IEnumMoniker> pEM;
if(types.GetCount() > 0
- && SUCCEEDED(m_pFM->EnumMatchingFilters(
- &pEM, 0, FALSE, MERIT_DO_NOT_USE+1,
- TRUE, types.GetCount()/2, types.GetData(), NULL, NULL, FALSE,
- !!pPinIn, 0, NULL, NULL, NULL)))
+ && SUCCEEDED(m_pFM->EnumMatchingFilters(
+ &pEM, 0, FALSE, MERIT_DO_NOT_USE+1,
+ TRUE, types.GetCount()/2, types.GetData(), NULL, NULL, FALSE,
+ !!pPinIn, 0, NULL, NULL, NULL)))
{
for(CComPtr<IMoniker> pMoniker; S_OK == pEM->Next(1, &pMoniker, NULL); pMoniker = NULL)
{
@@ -1008,8 +1008,8 @@ STDMETHODIMP CFGManager::ConnectFilter(IBaseFilter* pBF, IPin* pPinIn) BeginEnumPins(pBF, pEP, pPin)
{
if(GetPinName(pPin)[0] != '~'
- && S_OK == IsPinDirection(pPin, PINDIR_OUTPUT)
- && S_OK != IsPinConnected(pPin))
+ && S_OK == IsPinDirection(pPin, PINDIR_OUTPUT)
+ && S_OK != IsPinConnected(pPin))
{
m_streampath.Append(pBF, pPin);
@@ -1035,9 +1035,9 @@ STDMETHODIMP CFGManager::ConnectFilter(IBaseFilter* pBF, IPin* pPinIn) EndEnumPins;
return
- nRendered == nTotal ? (nRendered > 0 ? S_OK : S_FALSE) :
- nRendered > 0 ? VFW_S_PARTIAL_RENDER :
- VFW_E_CANNOT_RENDER;
+ nRendered == nTotal ? (nRendered > 0 ? S_OK : S_FALSE) :
+ nRendered > 0 ? VFW_S_PARTIAL_RENDER :
+ VFW_E_CANNOT_RENDER;
}
STDMETHODIMP CFGManager::ConnectFilter(IPin* pPinOut, IBaseFilter* pBF)
@@ -1053,8 +1053,8 @@ STDMETHODIMP CFGManager::ConnectFilter(IPin* pPinOut, IBaseFilter* pBF) BeginEnumPins(pBF, pEP, pPin)
{
if(GetPinName(pPin)[0] != '~'
- && S_OK == IsPinDirection(pPin, PINDIR_INPUT)
- && S_OK != IsPinConnected(pPin))
+ && S_OK == IsPinDirection(pPin, PINDIR_INPUT)
+ && S_OK != IsPinConnected(pPin))
{
HRESULT hr = Connect(pPinOut, pPin);
if(SUCCEEDED(hr))
@@ -1079,8 +1079,8 @@ STDMETHODIMP CFGManager::ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, co BeginEnumPins(pBF, pEP, pPin)
{
if(GetPinName(pPin)[0] != '~'
- && S_OK == IsPinDirection(pPin, PINDIR_INPUT)
- && S_OK != IsPinConnected(pPin))
+ && S_OK == IsPinDirection(pPin, PINDIR_INPUT)
+ && S_OK != IsPinConnected(pPin))
{
HRESULT hr = ConnectDirect(pPinOut, pPin, pmt);
if(SUCCEEDED(hr))
@@ -1108,7 +1108,7 @@ STDMETHODIMP CFGManager::NukeDownstream(IUnknown* pUnk) {
CComPtr<IPin> pPinTo;
if(S_OK == IsPinDirection(pPin, PINDIR_OUTPUT)
- && SUCCEEDED(pPin->ConnectedTo(&pPinTo)) && pPinTo)
+ && SUCCEEDED(pPin->ConnectedTo(&pPinTo)) && pPinTo)
{
if(CComPtr<IBaseFilter> pBF = GetFilterFromPin(pPinTo))
{
@@ -1158,7 +1158,7 @@ STDMETHODIMP CFGManager::AddToROT() WCHAR wsz[256];
swprintf(wsz, L"FilterGraph %08p pid %08x (MPC)", (DWORD_PTR)this, GetCurrentProcessId());
if(SUCCEEDED(hr = GetRunningObjectTable(0, &pROT))
- && SUCCEEDED(hr = CreateItemMoniker(L"!", wsz, &pMoniker)))
+ && SUCCEEDED(hr = CreateItemMoniker(L"!", wsz, &pMoniker)))
hr = pROT->Register(ROTFLAGS_REGISTRATIONKEEPSALIVE, (IGraphBuilder2*)this, pMoniker, &m_dwRegister);
return hr;
@@ -1174,7 +1174,7 @@ STDMETHODIMP CFGManager::RemoveFromROT() CComPtr<IRunningObjectTable> pROT;
if(SUCCEEDED(hr = GetRunningObjectTable(0, &pROT))
- && SUCCEEDED(hr = pROT->Revoke(m_dwRegister)))
+ && SUCCEEDED(hr = pROT->Revoke(m_dwRegister)))
m_dwRegister = 0;
return hr;
@@ -1573,8 +1573,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_MPEG1
pFGF = DNew CFGFilterInternal<CMpeg2DecFilter>(
- (tra[TRA_MPEG1]) ? ResStr(IDS_FGMANAGER_0) : L"MPEG-1 Video Decoder (low merit)",
- (tra[TRA_MPEG1]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_MPEG1]) ? ResStr(IDS_FGMANAGER_0) : L"MPEG-1 Video Decoder (low merit)",
+ (tra[TRA_MPEG1]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_MPEG1Packet);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_MPEG1Payload);
m_transform.AddTail(pFGF);
@@ -1582,8 +1582,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_MPEGAUDIO
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_MPA]) ? ResStr(IDS_FGMANAGER_2) : L"MPEG-1 Audio Decoder (low merit)",
- (tra[TRA_MPA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_MPA]) ? ResStr(IDS_FGMANAGER_2) : L"MPEG-1 Audio Decoder (low merit)",
+ (tra[TRA_MPA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_MP3);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1AudioPayload);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1Payload);
@@ -1591,8 +1591,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) m_transform.AddTail(pFGF);
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_MPA]) ? ResStr(IDS_FGMANAGER_3) : L"MPEG-2 Audio Decoder (low merit)",
- (tra[TRA_MPA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_MPA]) ? ResStr(IDS_FGMANAGER_3) : L"MPEG-2 Audio Decoder (low merit)",
+ (tra[TRA_MPA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_MPEG2_AUDIO);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_MPEG2_AUDIO);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_MPEG2_AUDIO);
@@ -1612,8 +1612,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_LPCM
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_LPCM]) ? ResStr(IDS_FGMANAGER_4) : L"LPCM Audio Decoder (low merit)",
- (tra[TRA_LPCM]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_LPCM]) ? ResStr(IDS_FGMANAGER_4) : L"LPCM Audio Decoder (low merit)",
+ (tra[TRA_LPCM]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_DVD_LPCM_AUDIO);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_DVD_LPCM_AUDIO);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_DVD_LPCM_AUDIO);
@@ -1624,8 +1624,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_AC3
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_AC3]) ? ResStr(IDS_FGMANAGER_5) : L"AC3 Audio Decoder (low merit)",
- (tra[TRA_AC3]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_AC3]) ? ResStr(IDS_FGMANAGER_5) : L"AC3 Audio Decoder (low merit)",
+ (tra[TRA_AC3]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_DOLBY_AC3);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_DOLBY_AC3);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_DOLBY_AC3);
@@ -1636,8 +1636,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_DTS
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_DTS]) ? ResStr(IDS_AG_DTS_DECODER) : L"DTS Decoder (low merit)",
- (tra[TRA_DTS]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_DTS]) ? ResStr(IDS_AG_DTS_DECODER) : L"DTS Decoder (low merit)",
+ (tra[TRA_DTS]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_DTS);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_DTS);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_DTS);
@@ -1648,8 +1648,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_AAC
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_AAC]) ? ResStr(IDS_AG_AAC_DECODER) : L"AAC Decoder (low merit)",
- (tra[TRA_AAC]) ? MERIT64_ABOVE_DSHOW+1 : MERIT64_DO_USE);
+ (tra[TRA_AAC]) ? ResStr(IDS_AG_AAC_DECODER) : L"AAC Decoder (low merit)",
+ (tra[TRA_AAC]) ? MERIT64_ABOVE_DSHOW+1 : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_AAC);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_AAC);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_AAC);
@@ -1667,8 +1667,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_PS2AUDIO
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_PS2AUD]) ? ResStr(IDS_FGMANAGER_8) : L"PS2 Audio Decoder (low merit)",
- (tra[TRA_PS2AUD]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_PS2AUD]) ? ResStr(IDS_FGMANAGER_8) : L"PS2 Audio Decoder (low merit)",
+ (tra[TRA_PS2AUD]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_PS2_PCM);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_PS2_PCM);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_PS2_PCM);
@@ -1678,8 +1678,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_REALVIDEO
pFGF = DNew CFGFilterInternal<CRealVideoDecoder>(
- (tra[TRA_RV]) ? ResStr(IDS_FGMANAGER_9) : L"RealVideo Decoder (low merit)",
- (tra[TRA_RV]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_RV]) ? ResStr(IDS_FGMANAGER_9) : L"RealVideo Decoder (low merit)",
+ (tra[TRA_RV]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_RV10);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_RV20);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_RV30);
@@ -1689,8 +1689,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_REALAUDIO
pFGF = DNew CFGFilterInternal<CRealAudioDecoder>(
- (tra[TRA_RA]) ? ResStr(IDS_FGMANAGER_10) : L"RealAudio Decoder (low merit)",
- (tra[TRA_RA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_RA]) ? ResStr(IDS_FGMANAGER_10) : L"RealAudio Decoder (low merit)",
+ (tra[TRA_RA]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_14_4);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_28_8);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_ATRC);
@@ -1703,24 +1703,24 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_VORBIS
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_VORBIS]) ? ResStr(IDS_FGMANAGER_11) : L"Vorbis Audio Decoder (low merit)",
- (tra[TRA_VORBIS]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_VORBIS]) ? ResStr(IDS_FGMANAGER_11) : L"Vorbis Audio Decoder (low merit)",
+ (tra[TRA_VORBIS]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_Vorbis2);
m_transform.AddTail(pFGF);
#endif
#if INTERNAL_DECODER_FLAC
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_FLAC]) ? L"Flac Audio Decoder" : L"Flac Audio Decoder (low merit)", // TODO : put in resource !
- (tra[TRA_FLAC]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_FLAC]) ? L"Flac Audio Decoder" : L"Flac Audio Decoder (low merit)", // TODO : put in resource !
+ (tra[TRA_FLAC]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_FLAC_FRAMED);
m_transform.AddTail(pFGF);
#endif
#if INTERNAL_DECODER_NELLYMOSER
pFGF = DNew CFGFilterInternal<CMpaDecFilter>(
- (tra[TRA_NELLY]) ? L"Nellymoser Audio Decoder" : L"Nellymoser Audio Decoder (low merit)", // TODO : put in resource !
- (tra[TRA_NELLY]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_NELLY]) ? L"Nellymoser Audio Decoder" : L"Nellymoser Audio Decoder (low merit)", // TODO : put in resource !
+ (tra[TRA_NELLY]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_NELLYMOSER);
m_transform.AddTail(pFGF);
#endif
@@ -1742,9 +1742,9 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_PCM_FL32_le);
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_PCM_FL64_le);
/* todo: this should not depend on PCM */
- #if INTERNAL_DECODER_IMA4
+#if INTERNAL_DECODER_IMA4
pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_IMA4);
- #endif
+#endif
m_transform.AddTail(pFGF);
#endif
@@ -2159,8 +2159,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) #if INTERNAL_DECODER_MPEG2
// Keep software decoder after DXVA decoder !
pFGF = DNew CFGFilterInternal<CMpeg2DecFilter>(
- (tra[TRA_MPEG2]) ? ResStr(IDS_FGMANAGER_1) : L"MPEG-2 Video Decoder (low merit)",
- (tra[TRA_MPEG2]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
+ (tra[TRA_MPEG2]) ? ResStr(IDS_FGMANAGER_1) : L"MPEG-2 Video Decoder (low merit)",
+ (tra[TRA_MPEG2]) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);
pFGF->AddType(MEDIATYPE_DVD_ENCRYPTED_PACK, MEDIASUBTYPE_MPEG2_VIDEO);
pFGF->AddType(MEDIATYPE_MPEG2_PACK, MEDIASUBTYPE_MPEG2_VIDEO);
pFGF->AddType(MEDIATYPE_MPEG2_PES, MEDIASUBTYPE_MPEG2_VIDEO);
@@ -2221,8 +2221,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) CString clsid = _T("{B38C58A0-1809-11D6-A458-EDAE78F1DF12}");
if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("CLSID\\") + clsid + _T("\\InprocServer32"), KEY_READ)
- && ERROR_SUCCESS == key.QueryStringValue(NULL, buff, &len)
- && GetFileVersion(buff) < 0x0001000000030000ui64)
+ && ERROR_SUCCESS == key.QueryStringValue(NULL, buff, &len)
+ && GetFileVersion(buff) < 0x0001000000030000ui64)
{
m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(clsid), MERIT64_DO_NOT_USE));
}
@@ -2261,9 +2261,9 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) continue;
ULONGLONG merit =
- fo->iLoadType == FilterOverride::PREFERRED ? MERIT64_ABOVE_DSHOW :
- fo->iLoadType == FilterOverride::MERIT ? MERIT64(fo->dwMerit) :
- MERIT64_DO_NOT_USE; // fo->iLoadType == FilterOverride::BLOCKED
+ fo->iLoadType == FilterOverride::PREFERRED ? MERIT64_ABOVE_DSHOW :
+ fo->iLoadType == FilterOverride::MERIT ? MERIT64(fo->dwMerit) :
+ MERIT64_DO_NOT_USE; // fo->iLoadType == FilterOverride::BLOCKED
merit += merit_low++;
@@ -2368,7 +2368,7 @@ CFGManagerPlayer::CFGManagerPlayer(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) GUID guids[] = {MEDIATYPE_Video, MEDIASUBTYPE_NULL};
if(SUCCEEDED(m_pFM->EnumMatchingFilters(&pEM, 0, FALSE, MERIT_DO_NOT_USE+1,
- TRUE, 1, guids, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL)))
+ TRUE, 1, guids, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL)))
{
for(CComPtr<IMoniker> pMoniker; S_OK == pEM->Next(1, &pMoniker, NULL); pMoniker = NULL)
{
@@ -2387,7 +2387,7 @@ CFGManagerPlayer::CFGManagerPlayer(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) GUID guids[] = {MEDIATYPE_Audio, MEDIASUBTYPE_NULL};
if(SUCCEEDED(m_pFM->EnumMatchingFilters(&pEM, 0, FALSE, MERIT_DO_NOT_USE+1,
- TRUE, 1, guids, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL)))
+ TRUE, 1, guids, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL)))
{
for(CComPtr<IMoniker> pMoniker; S_OK == pEM->Next(1, &pMoniker, NULL); pMoniker = NULL)
{
@@ -2575,7 +2575,7 @@ STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpc CComPtr<IBaseFilter> pBF;
if(FAILED(hr = pBF.CoCreateInstance(clsid))
- || FAILED(hr = AddFilter(pBF, L"DVD Navigator")))
+ || FAILED(hr = AddFilter(pBF, L"DVD Navigator")))
return VFW_E_CANNOT_LOAD_SOURCE_FILTER;
CComQIPtr<IDvdControl2> pDVDC;
@@ -2587,10 +2587,10 @@ STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpc WCHAR buff[_MAX_PATH];
ULONG len;
if((!fn.IsEmpty()
- && FAILED(hr = pDVDC->SetDVDDirectory(fn))
- && FAILED(hr = pDVDC->SetDVDDirectory(fn + L"VIDEO_TS"))
- && FAILED(hr = pDVDC->SetDVDDirectory(fn + L"\\VIDEO_TS")))
- || FAILED(hr = pDVDI->GetDVDDirectory(buff, countof(buff), &len)) || len == 0)
+ && FAILED(hr = pDVDC->SetDVDDirectory(fn))
+ && FAILED(hr = pDVDC->SetDVDDirectory(fn + L"VIDEO_TS"))
+ && FAILED(hr = pDVDC->SetDVDDirectory(fn + L"\\VIDEO_TS")))
+ || FAILED(hr = pDVDI->GetDVDDirectory(buff, countof(buff), &len)) || len == 0)
return E_INVALIDARG;
pDVDC->SetOption(DVD_ResetOnStop, FALSE);
@@ -2650,6 +2650,6 @@ STDMETHODIMP CFGAggregator::NonDelegatingQueryInterface(REFIID riid, void** ppv) CheckPointer(ppv, E_POINTER);
return
- m_pUnkInner && (riid != IID_IUnknown && SUCCEEDED(m_pUnkInner->QueryInterface(riid, ppv))) ? S_OK :
- __super::NonDelegatingQueryInterface(riid, ppv);
+ m_pUnkInner && (riid != IID_IUnknown && SUCCEEDED(m_pUnkInner->QueryInterface(riid, ppv))) ? S_OK :
+ __super::NonDelegatingQueryInterface(riid, ppv);
}
diff --git a/src/apps/mplayerc/FGManagerBDA.cpp b/src/apps/mplayerc/FGManagerBDA.cpp index 7de7482ef..c491d1385 100644 --- a/src/apps/mplayerc/FGManagerBDA.cpp +++ b/src/apps/mplayerc/FGManagerBDA.cpp @@ -312,8 +312,8 @@ HRESULT CFGManagerBDA::CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, CStr CComVariant var;
LPOLESTR strName = NULL;
if (SUCCEEDED (pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB)) &&
- SUCCEEDED (pMoniker->GetDisplayName(NULL, NULL, &strName)) &&
- SUCCEEDED (pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL)) )
+ SUCCEEDED (pMoniker->GetDisplayName(NULL, NULL, &strName)) &&
+ SUCCEEDED (pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL)) )
{
CStringW Name = CStringW(strName);
if (Name != DisplayName) continue;
@@ -372,12 +372,12 @@ HRESULT CFGManagerBDA::ConnectFilters(IBaseFilter* pOutFiter, IBaseFilter* pInFi BeginEnumPins(pOutFiter, pEP, pOutPin)
{
if(S_OK == IsPinDirection(pOutPin, PINDIR_OUTPUT)
- && S_OK != IsPinConnected(pOutPin))
+ && S_OK != IsPinConnected(pOutPin))
{
BeginEnumPins(pInFilter, pEP, pInPin)
{
if(S_OK == IsPinDirection(pInPin, PINDIR_INPUT)
- && S_OK != IsPinConnected(pInPin))
+ && S_OK != IsPinConnected(pInPin))
{
hr = this->ConnectDirect(pOutPin, pInPin, NULL);
@@ -715,9 +715,9 @@ STDMETHODIMP CFGManagerBDA::NonDelegatingQueryInterface(REFIID riid, void** ppv) CheckPointer(ppv, E_POINTER);
return
- QI(IBDATuner)
- QI(IAMStreamSelect)
- __super::NonDelegatingQueryInterface(riid, ppv);
+ QI(IBDATuner)
+ QI(IAMStreamSelect)
+ __super::NonDelegatingQueryInterface(riid, ppv);
}
@@ -752,7 +752,7 @@ HRESULT CFGManagerBDA::CreateMicrosoftDemux(IBaseFilter* pReceiver, CComPtr<IBas if (nType != DVB_EPG) // Hack: DVB_EPG not required
{
if (!Stream.GetFindExisting() ||
- (pPin = FindPin (pMpeg2Demux, PINDIR_OUTPUT, Stream.GetMediaType())) == NULL)
+ (pPin = FindPin (pMpeg2Demux, PINDIR_OUTPUT, Stream.GetMediaType())) == NULL)
{
CheckNoLog (pDemux->CreateOutputPin ((AM_MEDIA_TYPE*)Stream.GetMediaType(), Stream.GetName(), &pPin));
}
diff --git a/src/apps/mplayerc/FGManagerBDA.h b/src/apps/mplayerc/FGManagerBDA.h index 864bef169..1ad9239fc 100644 --- a/src/apps/mplayerc/FGManagerBDA.h +++ b/src/apps/mplayerc/FGManagerBDA.h @@ -70,8 +70,8 @@ public : m_pMap = pPin;
if (m_pMap &&
- SUCCEEDED (pPin->ConnectedTo (&pPinOut)) &&
- SUCCEEDED (pPinOut->QueryPinInfo (&PinInfo)))
+ SUCCEEDED (pPin->ConnectedTo (&pPinOut)) &&
+ SUCCEEDED (pPinOut->QueryPinInfo (&PinInfo)))
{
m_pFilter.Attach (PinInfo.pFilter);
}
diff --git a/src/apps/mplayerc/FilterEnum.h b/src/apps/mplayerc/FilterEnum.h index b390b1486..542bbbd32 100644 --- a/src/apps/mplayerc/FilterEnum.h +++ b/src/apps/mplayerc/FilterEnum.h @@ -26,10 +26,10 @@ enum
{
- SOURCE_FILTER,
- DECODER,
- DXVA_DECODER,
- FFMPEG_DECODER
+ SOURCE_FILTER,
+ DECODER,
+ DXVA_DECODER,
+ FFMPEG_DECODER
};
enum SOURCE_FILTER
diff --git a/src/apps/mplayerc/ISDb.h b/src/apps/mplayerc/ISDb.h index ba9dd7906..fdc6dea56 100644 --- a/src/apps/mplayerc/ISDb.h +++ b/src/apps/mplayerc/ISDb.h @@ -56,7 +56,7 @@ struct isdb_movie }
isdb_movie& operator = (const struct isdb_movie& m)
{
- if(this != &m)
+ if(this != &m)
{
titles.RemoveAll();
titles.AddTailList(&m.titles);
diff --git a/src/apps/mplayerc/LcdSupport.cpp b/src/apps/mplayerc/LcdSupport.cpp index 6455fd085..18b8fb3f8 100644 --- a/src/apps/mplayerc/LcdSupport.cpp +++ b/src/apps/mplayerc/LcdSupport.cpp @@ -55,7 +55,7 @@ void LCD_UpdateThread(void * Control) // using %#x is the long date representation,
// appropriate to the current locale
if (wcsftime(str, sizeof(str)/sizeof(wchar_t), _T("%#x"), (const struct tm *)&thetime) &&
- (ltime > ctrl->nThread_tTimeout || ltime < otime)) // message displayed, no update until timeout
+ (ltime > ctrl->nThread_tTimeout || ltime < otime)) // message displayed, no update until timeout
ctrl->m_Manager.m_Text[0].SetText(str);
if (wcsftime(str, sizeof(str)/sizeof(wchar_t), _T("%X"), (const struct tm *)&thetime))
@@ -237,7 +237,7 @@ CMPC_Lcd::CMPC_Lcd(void) m_ConnCtx.connection = LGLCD_INVALID_CONNECTION; // the "connection" member will be returned upon return
if (m_Output.Initialize(&m_ConnCtx) != ERROR_SUCCESS || // Initialize the output object
- m_Manager.Initialize() != ERROR_SUCCESS)
+ m_Manager.Initialize() != ERROR_SUCCESS)
{
//_tperror(_T("Initialize"));
return;
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 11a3e8617..a145c3dd4 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -151,7 +151,7 @@ public: else if(__fs == State_Running) \
SendMessage(WM_COMMAND, ID_PLAY_PLAY); \
} \
-
+
using namespace DSObjects;
/////////////////////////////////////////////////////////////////////////////
@@ -1178,7 +1178,7 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) || pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN))
return FALSE;
*/
- if(pMsg->wParam == VK_ESCAPE)
+ if(pMsg->wParam == VK_ESCAPE)
{
bool fEscapeNotAssigned = true;
AppSettings& s = AfxGetAppSettings();
@@ -6519,7 +6519,7 @@ void CMainFrame::OnViewCaptionmenu() switch(s.iCaptionMenuMode)
{
case MODE_BORDERLESS : // normal -> borderless
- dwRemove = WS_CAPTION | WS_THICKFRAME;
+ dwRemove = WS_CAPTION | WS_THICKFRAME;
wr.right -= (GetSystemMetrics( SM_CXSIZEFRAME ) * 2); // "Resize" borders
wr.bottom -= (GetSystemMetrics( SM_CYSIZEFRAME ) * 2); // "Resize" borders
wr.bottom -= (GetSystemMetrics( SM_CYCAPTION ) + GetSystemMetrics( SM_CYMENU ));
@@ -7288,9 +7288,9 @@ void CMainFrame::OnUpdatePlayPauseStop(CCmdUI* pCmdUI) OAFilterState fs = m_fFrameSteppingActive ? State_Paused : GetMediaState();
pCmdUI->SetCheck(fs == State_Running && pCmdUI->m_nID == ID_PLAY_PLAY
- || fs == State_Paused && pCmdUI->m_nID == ID_PLAY_PAUSE
- || fs == State_Stopped && pCmdUI->m_nID == ID_PLAY_STOP
- || (fs == State_Paused || fs == State_Running) && pCmdUI->m_nID == ID_PLAY_PLAYPAUSE);
+ || fs == State_Paused && pCmdUI->m_nID == ID_PLAY_PAUSE
+ || fs == State_Stopped && pCmdUI->m_nID == ID_PLAY_STOP
+ || (fs == State_Paused || fs == State_Running) && pCmdUI->m_nID == ID_PLAY_PLAYPAUSE);
bool fEnable = false;
@@ -7307,7 +7307,7 @@ void CMainFrame::OnUpdatePlayPauseStop(CCmdUI* pCmdUI) else if(GetPlaybackMode() == PM_DVD)
{
fEnable = m_iDVDDomain != DVD_DOMAIN_VideoManagerMenu
- && m_iDVDDomain != DVD_DOMAIN_VideoTitleSetMenu;
+ && m_iDVDDomain != DVD_DOMAIN_VideoTitleSetMenu;
if(fs == State_Stopped && pCmdUI->m_nID == ID_PLAY_PAUSE) fEnable = false;
}
@@ -7406,9 +7406,9 @@ void CMainFrame::OnUpdatePlayFramestep(CCmdUI* pCmdUI) bool fEnable = false;
if(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly &&
- (GetPlaybackMode() != PM_DVD || m_iDVDDomain == DVD_DOMAIN_Title) &&
- GetPlaybackMode() != PM_CAPTURE &&
- !m_fLiveWM)
+ (GetPlaybackMode() != PM_DVD || m_iDVDDomain == DVD_DOMAIN_Title) &&
+ GetPlaybackMode() != PM_CAPTURE &&
+ !m_fLiveWM)
{
if(S_OK == pMS->IsFormatSupported(&TIME_FORMAT_FRAME))
fEnable = true;
@@ -7428,13 +7428,13 @@ void CMainFrame::OnPlaySeek(UINT nID) AppSettings& s = AfxGetAppSettings();
REFERENCE_TIME dt =
- nID == ID_PLAY_SEEKBACKWARDSMALL ? -10000i64*s.nJumpDistS :
- nID == ID_PLAY_SEEKFORWARDSMALL ? +10000i64*s.nJumpDistS :
- nID == ID_PLAY_SEEKBACKWARDMED ? -10000i64*s.nJumpDistM :
- nID == ID_PLAY_SEEKFORWARDMED ? +10000i64*s.nJumpDistM :
- nID == ID_PLAY_SEEKBACKWARDLARGE ? -10000i64*s.nJumpDistL :
- nID == ID_PLAY_SEEKFORWARDLARGE ? +10000i64*s.nJumpDistL :
- 0;
+ nID == ID_PLAY_SEEKBACKWARDSMALL ? -10000i64*s.nJumpDistS :
+ nID == ID_PLAY_SEEKFORWARDSMALL ? +10000i64*s.nJumpDistS :
+ nID == ID_PLAY_SEEKBACKWARDMED ? -10000i64*s.nJumpDistM :
+ nID == ID_PLAY_SEEKFORWARDMED ? +10000i64*s.nJumpDistM :
+ nID == ID_PLAY_SEEKBACKWARDLARGE ? -10000i64*s.nJumpDistL :
+ nID == ID_PLAY_SEEKFORWARDLARGE ? +10000i64*s.nJumpDistL :
+ 0;
if(!dt) return;
@@ -7508,8 +7508,8 @@ void CMainFrame::OnPlaySeekKey(UINT nID) if(i > 0) dec = (UINT)max(min(rtCurrent - m_kfs[i-1], 10000000), 0);
rtCurrent =
- nID == ID_PLAY_SEEKKEYBACKWARD ? max(rtCurrent - dec, 0) :
- nID == ID_PLAY_SEEKKEYFORWARD ? rtCurrent : 0;
+ nID == ID_PLAY_SEEKKEYBACKWARD ? max(rtCurrent - dec, 0) :
+ nID == ID_PLAY_SEEKKEYFORWARD ? rtCurrent : 0;
i = rangebsearch(rtCurrent, m_kfs);
@@ -7527,8 +7527,8 @@ void CMainFrame::OnPlaySeekKey(UINT nID) rtCurrent += 10;
hr = pMS->SetPositions(
- &rtCurrent, AM_SEEKING_AbsolutePositioning|AM_SEEKING_SeekToKeyFrame,
- NULL, AM_SEEKING_NoPositioning);
+ &rtCurrent, AM_SEEKING_AbsolutePositioning|AM_SEEKING_SeekToKeyFrame,
+ NULL, AM_SEEKING_NoPositioning);
m_OSD.DisplayMessage(OSD_TOPLEFT, m_wndStatusBar.GetStatusTimer(), 1500);
}
@@ -7788,9 +7788,9 @@ void CMainFrame::OnPlayChangeAudDelay(UINT nID) {
REFERENCE_TIME rtShift = pASF->GetAudioTimeShift();
rtShift +=
- nID == ID_PLAY_INCAUDDELAY ? 100000 :
- nID == ID_PLAY_DECAUDDELAY ? -100000 :
- 0;
+ nID == ID_PLAY_INCAUDDELAY ? 100000 :
+ nID == ID_PLAY_DECAUDDELAY ? -100000 :
+ 0;
SetAudioDelay (rtShift);
}
diff --git a/src/apps/mplayerc/MediaFormats.cpp b/src/apps/mplayerc/MediaFormats.cpp index 9b9e81ec9..5986e208a 100644 --- a/src/apps/mplayerc/MediaFormats.cpp +++ b/src/apps/mplayerc/MediaFormats.cpp @@ -85,7 +85,7 @@ CMediaFormatCategory::CMediaFormatCategory(const CMediaFormatCategory& mfc) CMediaFormatCategory& CMediaFormatCategory::operator = (const CMediaFormatCategory& mfc)
{
- if(this != &mfc)
+ if(this != &mfc)
{
m_label = mfc.m_label;
m_specreqnote = mfc.m_specreqnote;
diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 26f178a72..eebce8fa5 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -367,7 +367,7 @@ HRESULT CMpeg2DataParser::SetTime(CGolombBuffer& gb, PresentFollowing &NowNext) ptmTime = localtime(&tTime2);
strftime (DescBuffer,6,"%H:%M",ptmTime);
DescBuffer[6] = 0;
- NowNext.Duration = static_cast<CString> (DescBuffer);
+ NowNext.Duration = static_cast<CString> (DescBuffer);
return S_OK;
}
@@ -390,7 +390,7 @@ HRESULT CMpeg2DataParser::ParseEIT(ULONG ulSID, PresentFollowing &NowNext) do
{
CheckNoLog (m_pData->GetSection (PID_EIT, SI_EIT_act, NULL, 5000, &pSectionList));
-
+
CheckNoLog (pSectionList->GetSectionData (0, &dwLength, &data));
CGolombBuffer gb ((BYTE*)data, dwLength);
@@ -476,8 +476,8 @@ HRESULT CMpeg2DataParser::ParseEIT(ULONG ulSID, PresentFollowing &NowNext) m_Filter.SectionNumber++;
pSectionList.Release();
}
- while (((InfoEvent.ServiceId != ulSID) || (InfoEvent.CurrentNextIndicator != 1) || (InfoEvent.RunninStatus != 4)) &&
- (m_Filter.SectionNumber <= 22));
+ while (((InfoEvent.ServiceId != ulSID) || (InfoEvent.CurrentNextIndicator != 1) || (InfoEvent.RunninStatus != 4)) &&
+ (m_Filter.SectionNumber <= 22));
if (InfoEvent.ServiceId != ulSID)
{
diff --git a/src/apps/mplayerc/OpenDlg.cpp b/src/apps/mplayerc/OpenDlg.cpp index c66075137..9bce1117f 100644 --- a/src/apps/mplayerc/OpenDlg.cpp +++ b/src/apps/mplayerc/OpenDlg.cpp @@ -145,9 +145,9 @@ void COpenDlg::OnBnClickedBrowsebutton() }
if(m_fns.GetCount() > 1
- || m_fns.GetCount() == 1
- && (m_fns.GetHead()[m_fns.GetHead().GetLength()-1] == '\\'
- || m_fns.GetHead()[m_fns.GetHead().GetLength()-1] == '*'))
+ || m_fns.GetCount() == 1
+ && (m_fns.GetHead()[m_fns.GetHead().GetLength()-1] == '\\'
+ || m_fns.GetHead()[m_fns.GetHead().GetLength()-1] == '*'))
{
m_fMultipleFiles = true;
EndDialog(IDOK);
diff --git a/src/apps/mplayerc/OpenFileDlg.cpp b/src/apps/mplayerc/OpenFileDlg.cpp index d0d39ef31..747686ae2 100644 --- a/src/apps/mplayerc/OpenFileDlg.cpp +++ b/src/apps/mplayerc/OpenFileDlg.cpp @@ -64,7 +64,7 @@ END_MESSAGE_MAP() LRESULT CALLBACK COpenFileDlg::WindowProcNew(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if(message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDOK
- && m_fAllowDirSelection)
+ && m_fAllowDirSelection)
{
CAutoVectorPtr<TCHAR> path;
path.Allocate(_MAX_PATH+1); // _MAX_PATH should be bigger for multiple selection, but we are only interested if it's zero length
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index cebe187e1..09a1c27f6 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -1185,8 +1185,8 @@ bool CPlayerCaptureDialog::IsTunerActive() long PinIndexRelated, PhysicalType;
return(m_pAMXB
- && SUCCEEDED(m_pAMXB->get_CrossbarPinInfo(TRUE, iSel, &PinIndexRelated, &PhysicalType))
- && PhysicalType == PhysConn_Video_Tuner);
+ && SUCCEEDED(m_pAMXB->get_CrossbarPinInfo(TRUE, iSel, &PinIndexRelated, &PhysicalType))
+ && PhysicalType == PhysConn_Video_Tuner);
}
bool CPlayerCaptureDialog::SetVideoInput(int input)
@@ -1405,10 +1405,10 @@ void CPlayerCaptureDialog::OnVideoDimension() if(!pvfe) return;
BITMAPINFOHEADER* bih = (pvfe->mt.formattype == FORMAT_VideoInfo)
- ? &((VIDEOINFOHEADER*)pvfe->mt.pbFormat)->bmiHeader
- : (pvfe->mt.formattype == FORMAT_VideoInfo2)
- ? &((VIDEOINFOHEADER2*)pvfe->mt.pbFormat)->bmiHeader
- : NULL;
+ ? &((VIDEOINFOHEADER*)pvfe->mt.pbFormat)->bmiHeader
+ : (pvfe->mt.formattype == FORMAT_VideoInfo2)
+ ? &((VIDEOINFOHEADER2*)pvfe->mt.pbFormat)->bmiHeader
+ : NULL;
m_vidhor.SetRange(0, 32767);
m_vidver.SetRange(0, 32767);
@@ -1515,8 +1515,8 @@ void CPlayerCaptureDialog::OnAudioCodecDimension() void CPlayerCaptureDialog::OnOpenFile()
{
CFileDialog fd(FALSE, NULL, NULL,
- OFN_EXPLORER|OFN_ENABLESIZING|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT,
- _T("Media files (*.avi,*.ogm,*.mkv,*.dsm)|*.avi;*.ogm;*.mkv;*.dsm|"), this, 0);
+ OFN_EXPLORER|OFN_ENABLESIZING|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT,
+ _T("Media files (*.avi,*.ogm,*.mkv,*.dsm)|*.avi;*.ogm;*.mkv;*.dsm|"), this, 0);
if(fd.DoModal() == IDOK)
{
@@ -1567,8 +1567,8 @@ void CPlayerCaptureDialog::OnRecord() }
if(!pFSF
- || FAILED(pFSF->SetFileName(CStringW(m_file), NULL))
- || FAILED(pFSF->SetMode(AM_FILE_OVERWRITE)))
+ || FAILED(pFSF->SetFileName(CStringW(m_file), NULL))
+ || FAILED(pFSF->SetMode(AM_FILE_OVERWRITE)))
{
AfxMessageBox(_T("Error initializing the output file"));
return;
@@ -1592,8 +1592,8 @@ void CPlayerCaptureDialog::OnRecord() }
if(!pFSF
- || FAILED(pFSF->SetFileName(CStringW(audfn), NULL))
- || FAILED(pFSF->SetMode(AM_FILE_OVERWRITE)))
+ || FAILED(pFSF->SetFileName(CStringW(audfn), NULL))
+ || FAILED(pFSF->SetMode(AM_FILE_OVERWRITE)))
{
AfxMessageBox(_T("Error initializing the audio output file"));
return;
@@ -1663,7 +1663,7 @@ void CPlayerCaptureDialog::OnTimer(UINT_PTR nIDEvent) {
ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes;
if(GetDiskFreeSpaceEx(m_file.Left(m_file.ReverseFind('\\')+1), &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)
- && FreeBytesAvailable.QuadPart < 1024i64*1024*10)
+ && FreeBytesAvailable.QuadPart < 1024i64*1024*10)
{
OnRecord();
}
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.cpp b/src/apps/mplayerc/PlayerNavigationDialog.cpp index 6dccb27d5..6e4a84c73 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.cpp +++ b/src/apps/mplayerc/PlayerNavigationDialog.cpp @@ -214,7 +214,7 @@ void CPlayerNavigationDialog::OnSelChangeComboAudio() TempWnd = static_cast<CPlayerNavigationBar*> (m_pParent) -> m_pParent;
static_cast<CMainFrame*> (TempWnd) -> OnNavigateAudio(nID);
-
+
pChannel->SetDefaultAudio(m_ComboAudio.GetCurSel());
pChannel->ToString();
}
|