diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-04-15 10:22:03 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-04-21 11:57:40 +0400 |
commit | 1f928e5db8bcc40ddb8c48b619fe5cc69f0968eb (patch) | |
tree | 5beeefc8a1e3c064c5058ca422b42e80fec9817f | |
parent | d6d408f01a4edc5fbe3188d79a12114a64e3308c (diff) |
astyle: specify --close-templates
-rw-r--r-- | contrib/astyle.ini | 1 | ||||
-rw-r--r-- | src/SubPic/DX9SubPic.h | 4 | ||||
-rw-r--r-- | src/Subtitles/STS.cpp | 2 | ||||
-rw-r--r-- | src/Subtitles/STS.h | 6 | ||||
-rw-r--r-- | src/Subtitles/VobSubImage.cpp | 2 | ||||
-rw-r--r-- | src/filters/parser/AviSplitter/AviSplitter.cpp | 2 | ||||
-rw-r--r-- | src/filters/parser/DSMSplitter/DSMSplitterFile.h | 2 | ||||
-rw-r--r-- | src/filters/parser/MatroskaSplitter/MatroskaSplitter.h | 4 | ||||
-rw-r--r-- | src/filters/parser/MpegSplitter/MpegSplitter.cpp | 2 | ||||
-rw-r--r-- | src/filters/parser/OggSplitter/OggSplitter.cpp | 2 | ||||
-rw-r--r-- | src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp | 2 | ||||
-rw-r--r-- | src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp | 2 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp | 6 | ||||
-rw-r--r-- | src/filters/transform/MpaDecFilter/MpaDecFilter.cpp | 2 | ||||
-rw-r--r-- | src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp | 2 | ||||
-rw-r--r-- | src/mpc-hc/PlayerCaptureDialog.h | 10 | ||||
-rw-r--r-- | src/mpc-hc/stdafx.h | 2 |
17 files changed, 27 insertions, 26 deletions
diff --git a/contrib/astyle.ini b/contrib/astyle.ini index 08f9a15ed..75196cef9 100644 --- a/contrib/astyle.ini +++ b/contrib/astyle.ini @@ -21,6 +21,7 @@ --indent-switches --indent-namespaces --indent-col1-comments --pad-header --pad-oper --unpad-paren --align-pointer=type --align-reference=type +--close-templates --add-brackets --keep-one-line-blocks --convert-tabs diff --git a/src/SubPic/DX9SubPic.h b/src/SubPic/DX9SubPic.h index fa5c7dd3e..b11bb3a5b 100644 --- a/src/SubPic/DX9SubPic.h +++ b/src/SubPic/DX9SubPic.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -100,7 +100,7 @@ class CDX9SubPicAllocator : public CSubPicAllocatorImpl, public CCritSec public:
static CCritSec ms_SurfaceQueueLock;
- CAtlList<CComPtr<IDirect3DSurface9> > m_FreeSurfaces;
+ CAtlList<CComPtr<IDirect3DSurface9>> m_FreeSurfaces;
CAtlList<CDX9SubPic*> m_AllocatedSurfaces;
void GetStats(int& _nFree, int& _nAlloc);
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp index daf2a00d4..e30025771 100644 --- a/src/Subtitles/STS.cpp +++ b/src/Subtitles/STS.cpp @@ -2055,7 +2055,7 @@ STSStyle* CSimpleTextSubtitle::CreateDefaultStyle(int CharSet) void CSimpleTextSubtitle::ChangeUnknownStylesToDefault()
{
- CAtlMap<CString, STSStyle*, CStringElementTraits<CString> > unknown;
+ CAtlMap<CString, STSStyle*, CStringElementTraits<CString>> unknown;
bool fReport = true;
for (size_t i = 0; i < GetCount(); i++) {
diff --git a/src/Subtitles/STS.h b/src/Subtitles/STS.h index 16b172c35..89267f2ef 100644 --- a/src/Subtitles/STS.h +++ b/src/Subtitles/STS.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -69,7 +69,7 @@ public: friend STSStyle& operator <<= (STSStyle& s, CString& style);
};
-class CSTSStyleMap : public CAtlMap<CString, STSStyle*, CStringElementTraits<CString> >
+class CSTSStyleMap : public CAtlMap<CString, STSStyle*, CStringElementTraits<CString>>
{
public:
CSTSStyleMap() {}
@@ -206,7 +206,7 @@ extern BYTE CharSetList[]; extern TCHAR* CharSetNames[];
extern int CharSetLen;
-class CHtmlColorMap : public CAtlMap<CString, DWORD, CStringElementTraits<CString> >
+class CHtmlColorMap : public CAtlMap<CString, DWORD, CStringElementTraits<CString>>
{
public:
CHtmlColorMap();
diff --git a/src/Subtitles/VobSubImage.cpp b/src/Subtitles/VobSubImage.cpp index 7825a5ce4..7ff3abf33 100644 --- a/src/Subtitles/VobSubImage.cpp +++ b/src/Subtitles/VobSubImage.cpp @@ -1125,7 +1125,7 @@ void CVobSubImage::AddSegment(COutline& o, CAtlArray<BYTE>& pathTypes, CAtlArray bool CVobSubImage::Polygonize(CAtlArray<BYTE>& pathTypes, CAtlArray<CPoint>& pathPoints, bool fSmooth, int scale)
{
CPoint topleft;
- CAutoPtr<CAutoPtrList<COutline> > ol(GetOutlineList(topleft));
+ CAutoPtr<CAutoPtrList<COutline>> ol(GetOutlineList(topleft));
if (!ol) {
return false;
}
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp index aa47cc656..6cf06fcc8 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.cpp +++ b/src/filters/parser/AviSplitter/AviSplitter.cpp @@ -46,7 +46,7 @@ const AMOVIESETUP_FILTER sudFilter[] = { CFactoryTemplate g_Templates[] = {
{sudFilter[0].strName, sudFilter[0].clsID, CreateInstance<CAviSplitterFilter>, NULL, &sudFilter[0]},
{sudFilter[1].strName, sudFilter[1].clsID, CreateInstance<CAviSourceFilter>, NULL, &sudFilter[1]},
- {L"CAviSplitterPropertyPage", &__uuidof(CAviSplitterSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CAviSplitterSettingsWnd> >},
+ {L"CAviSplitterPropertyPage", &__uuidof(CAviSplitterSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CAviSplitterSettingsWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.h b/src/filters/parser/DSMSplitter/DSMSplitterFile.h index 28f3b1374..fceef02e8 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.h +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.h @@ -41,7 +41,7 @@ public: };
CAtlArray<SyncPoint> m_sps;
- typedef CAtlMap<CStringA, CStringW, CStringElementTraits<CStringA>, CStringElementTraits<CStringW> > CStreamInfoMap;
+ typedef CAtlMap<CStringA, CStringW, CStringElementTraits<CStringA>, CStringElementTraits<CStringW>> CStreamInfoMap;
CStreamInfoMap m_fim;
CAtlMap<BYTE, CStreamInfoMap> m_sim;
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h index 1e27c0653..774443f12 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -88,7 +88,7 @@ protected: HRESULT CreateOutputs(IAsyncReader* pAsyncReader);
CAtlMap<DWORD, MatroskaReader::TrackEntry*> m_pTrackEntryMap;
- CAtlArray<MatroskaReader::TrackEntry* > m_pOrderedTrackArray;
+ CAtlArray<MatroskaReader::TrackEntry*> m_pOrderedTrackArray;
MatroskaReader::TrackEntry* GetTrackEntryAt(UINT aTrackIdx);
bool DemuxInit();
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 937840ea9..7fba2a8fc 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -84,7 +84,7 @@ const AMOVIESETUP_FILTER sudFilter[] = { CFactoryTemplate g_Templates[] = {
{sudFilter[0].strName, sudFilter[0].clsID, CreateInstance<CMpegSplitterFilter>, NULL, &sudFilter[0]},
{sudFilter[1].strName, sudFilter[1].clsID, CreateInstance<CMpegSourceFilter>, NULL, &sudFilter[1]},
- {L"CMpegSplitterPropertyPage", &__uuidof(CMpegSplitterSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpegSplitterSettingsWnd> >},
+ {L"CMpegSplitterPropertyPage", &__uuidof(CMpegSplitterSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpegSplitterSettingsWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index 0b06f2370..1c9a55433 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -303,7 +303,7 @@ HRESULT COggSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) // comments
{
- CAtlMap<CStringW, CStringW, CStringElementTraits<CStringW> > tagmap;
+ CAtlMap<CStringW, CStringW, CStringElementTraits<CStringW>> tagmap;
tagmap[L"TITLE"] = L"TITL";
tagmap[L"ARTIST"] = L"AUTH"; // not quite
tagmap[L"COPYRIGHT"] = L"CPYR";
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 9af08a1e0..a59215e77 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -437,7 +437,7 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) }
}
} else if (pmp->mime == "logical-fileinfo") {
- CAtlMap<CStringA, CStringA, CStringElementTraits<CStringA> > lfi;
+ CAtlMap<CStringA, CStringA, CStringElementTraits<CStringA>> lfi;
CStringA key, value;
BYTE* p = pmp->typeSpecData.GetData();
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 13a9dea04..ade31710b 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -47,7 +47,7 @@ const AMOVIESETUP_FILTER sudFilter[] = { CFactoryTemplate g_Templates[] = {
{sudFilter[0].strName, &__uuidof(CMpcAudioRenderer), CreateInstance<CMpcAudioRenderer>, NULL, &sudFilter[0]},
- {L"CMpcAudioRendererPropertyPage", &__uuidof(CMpcAudioRendererSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpcAudioRendererSettingsWnd> >},
+ {L"CMpcAudioRendererPropertyPage", &__uuidof(CMpcAudioRendererSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpcAudioRendererSettingsWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp b/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp index d35141661..b10403b6c 100644 --- a/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp +++ b/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp @@ -1,5 +1,5 @@ /*
- * (C) 2007-2012 see Authors.txt
+ * (C) 2007-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -36,8 +36,8 @@ const AMOVIESETUP_FILTER sudFilters[] = { CFactoryTemplate g_Templates[] = {
{sudFilters[0].strName, &__uuidof(CMPCVideoDecFilter), CreateInstance<CMPCVideoDecFilter>, NULL, &sudFilters[0]},
- {L"CMPCVideoDecPropertyPage", &__uuidof(CMPCVideoDecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMPCVideoDecSettingsWnd> >},
- {L"CMPCVideoDecPropertyPage2", &__uuidof(CMPCVideoDecCodecWnd), CreateInstance<CInternalPropertyPageTempl<CMPCVideoDecCodecWnd> >},
+ {L"CMPCVideoDecPropertyPage", &__uuidof(CMPCVideoDecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMPCVideoDecSettingsWnd>>},
+ {L"CMPCVideoDecPropertyPage2", &__uuidof(CMPCVideoDecCodecWnd), CreateInstance<CInternalPropertyPageTempl<CMPCVideoDecCodecWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 780d649c0..51ea6bf25 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -207,7 +207,7 @@ const AMOVIESETUP_FILTER sudFilter[] = { CFactoryTemplate g_Templates[] = {
{sudFilter[0].strName, &__uuidof(CMpaDecFilter), CreateInstance<CMpaDecFilter>, NULL, &sudFilter[0]},
- {L"CMpaDecPropertyPage", &__uuidof(CMpaDecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpaDecSettingsWnd> >},
+ {L"CMpaDecPropertyPage", &__uuidof(CMpaDecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpaDecSettingsWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 62b820bb7..95387e7f9 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -72,7 +72,7 @@ const AMOVIESETUP_FILTER sudFilter[] = { CFactoryTemplate g_Templates[] = {
{sudFilter[0].strName, sudFilter[0].clsID, CreateInstance<CMpeg2DecFilter>, NULL, &sudFilter[0]},
- {L"CMpeg2DecPropertyPage", &__uuidof(CMpeg2DecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpeg2DecSettingsWnd> >},
+ {L"CMpeg2DecPropertyPage", &__uuidof(CMpeg2DecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMpeg2DecSettingsWnd>>},
};
int g_cTemplates = _countof(g_Templates);
diff --git a/src/mpc-hc/PlayerCaptureDialog.h b/src/mpc-hc/PlayerCaptureDialog.h index d4655bef8..665c627bc 100644 --- a/src/mpc-hc/PlayerCaptureDialog.h +++ b/src/mpc-hc/PlayerCaptureDialog.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -40,7 +40,7 @@ public: };
template<class T>
-class CFormat : public CAutoPtrArray<CFormatElem<T> >
+class CFormat : public CAutoPtrArray<CFormatElem<T>>
{
public:
CString name;
@@ -51,7 +51,7 @@ public: };
template<class T>
-class CFormatArray : public CAutoPtrArray<CFormat<T> >
+class CFormatArray : public CAutoPtrArray<CFormat<T>>
{
public:
virtual ~CFormatArray() {}
@@ -64,7 +64,7 @@ public: }
if (fCreate) {
- CAutoPtr<CFormat<T> > pf(DEBUG_NEW CFormat<T>(name));
+ CAutoPtr<CFormat<T>> pf(DEBUG_NEW CFormat<T>(name));
CFormat<T>* tmp = pf;
Add(pf);
return tmp;
@@ -135,7 +135,7 @@ public: return false;
}
- CAutoPtr<CFormatElem<T> > pfe(DEBUG_NEW CFormatElem<T>());
+ CAutoPtr<CFormatElem<T>> pfe(DEBUG_NEW CFormatElem<T>());
pfe->mt = *pmt;
pfe->caps = caps;
pf->Add(pfe);
diff --git a/src/mpc-hc/stdafx.h b/src/mpc-hc/stdafx.h index 8364616f5..a85eca735 100644 --- a/src/mpc-hc/stdafx.h +++ b/src/mpc-hc/stdafx.h @@ -73,7 +73,7 @@ #include "DSUtil.h"
template <class T = CString, class S = CString>
-class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S> > {};
+class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S>> {};
#define CheckAndLog(x, msg) hr = ##x; if (FAILED(hr)) { TRACE(msg _T(": 0x%08x\n"), hr); return hr; }
#define CheckNoLog(x) hr = ##x; if (FAILED(hr)) { return hr; }
|