diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2013-05-31 00:28:29 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2013-06-19 00:18:19 +0400 |
| commit | c5fb9c73b7f622300cf5d36346fdf8872d79cf2b (patch) | |
| tree | fa7ebb3e907311ea8cf0a856ad781bcd45367dc7 | |
| parent | 0d31965a98684ffe01c42a15a40a30c8388f7d3d (diff) | |
Replace remaining NULL by nullptr when possible.
65 files changed, 277 insertions, 277 deletions
diff --git a/src/CmdUI/CmdUI.h b/src/CmdUI/CmdUI.h index 5aa38fab9..2e22aa924 100644 --- a/src/CmdUI/CmdUI.h +++ b/src/CmdUI/CmdUI.h @@ -31,8 +31,8 @@ class CCmdUIDialog : public CDialog public:
CCmdUIDialog();
- CCmdUIDialog(UINT nIDTemplate, CWnd* pParent = NULL);
- CCmdUIDialog(LPCTSTR lpszTemplateName, CWnd* pParent = NULL);
+ CCmdUIDialog(UINT nIDTemplate, CWnd* pParent = nullptr);
+ CCmdUIDialog(LPCTSTR lpszTemplateName, CWnd* pParent = nullptr);
virtual ~CCmdUIDialog();
protected:
diff --git a/src/DSUtil/DSMPropertyBag.h b/src/DSUtil/DSMPropertyBag.h index 678e0c81b..f11693836 100644 --- a/src/DSUtil/DSMPropertyBag.h +++ b/src/DSUtil/DSMPropertyBag.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.
*
@@ -114,7 +114,7 @@ public: STDMETHODIMP_(DWORD) ResGetCount();
STDMETHODIMP ResGet(DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime,
- BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag = NULL);
+ BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag = nullptr);
STDMETHODIMP ResSet(DWORD iIndex, LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime,
BYTE* pData, DWORD len, DWORD_PTR tag = 0);
STDMETHODIMP ResAppend(LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime,
@@ -166,12 +166,12 @@ public: // IDSMChapterBag
STDMETHODIMP_(DWORD) ChapGetCount();
- STDMETHODIMP ChapGet(DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName = NULL);
+ STDMETHODIMP ChapGet(DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName = nullptr);
STDMETHODIMP ChapSet(DWORD iIndex, REFERENCE_TIME rt, LPCWSTR pName);
STDMETHODIMP ChapAppend(REFERENCE_TIME rt, LPCWSTR pName);
STDMETHODIMP ChapRemoveAt(DWORD iIndex);
STDMETHODIMP ChapRemoveAll();
- STDMETHODIMP_(long) ChapLookup(REFERENCE_TIME* prt, BSTR* ppName = NULL);
+ STDMETHODIMP_(long) ChapLookup(REFERENCE_TIME* prt, BSTR* ppName = nullptr);
STDMETHODIMP ChapSort();
};
diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h index 495d0273c..06772630b 100644 --- a/src/DSUtil/DSUtil.h +++ b/src/DSUtil/DSUtil.h @@ -39,8 +39,8 @@ extern bool IsStreamStart(IBaseFilter* pBF); extern bool IsStreamEnd(IBaseFilter* pBF);
extern bool IsVideoRenderer(IBaseFilter* pBF);
extern bool IsAudioWaveRenderer(IBaseFilter* pBF);
-extern IBaseFilter* GetUpStreamFilter(IBaseFilter* pBF, IPin* pInputPin = NULL);
-extern IPin* GetUpStreamPin(IBaseFilter* pBF, IPin* pInputPin = NULL);
+extern IBaseFilter* GetUpStreamFilter(IBaseFilter* pBF, IPin* pInputPin = nullptr);
+extern IPin* GetUpStreamPin(IBaseFilter* pBF, IPin* pInputPin = nullptr);
extern IPin* GetFirstPin(IBaseFilter* pBF, PIN_DIRECTION dir = PINDIR_INPUT);
extern IPin* GetFirstDisconnectedPin(IBaseFilter* pBF, PIN_DIRECTION dir);
extern void NukeDownstream(IBaseFilter* pBF, IFilterGraph* pFG);
@@ -112,8 +112,8 @@ extern BOOL CFileGetStatus(LPCTSTR lpszFileName, CFileStatus& status); extern bool DeleteRegKey(LPCTSTR pszKey, LPCTSTR pszSubkey);
extern bool SetRegKeyValue(LPCTSTR pszKey, LPCTSTR pszSubkey, LPCTSTR pszValueName, LPCTSTR pszValue);
extern bool SetRegKeyValue(LPCTSTR pszKey, LPCTSTR pszSubkey, LPCTSTR pszValue);
-extern void RegisterSourceFilter(const CLSID& clsid, const GUID& subtype2, LPCTSTR chkbytes, LPCTSTR ext = NULL, ...);
-extern void RegisterSourceFilter(const CLSID& clsid, const GUID& subtype2, const CAtlList<CString>& chkbytes, LPCTSTR ext = NULL, ...);
+extern void RegisterSourceFilter(const CLSID& clsid, const GUID& subtype2, LPCTSTR chkbytes, LPCTSTR ext = nullptr, ...);
+extern void RegisterSourceFilter(const CLSID& clsid, const GUID& subtype2, const CAtlList<CString>& chkbytes, LPCTSTR ext = nullptr, ...);
extern void UnRegisterSourceFilter(const GUID& subtype);
extern LPCTSTR GetDXVAMode(const GUID* guidDecoder);
extern void DumpBuffer(BYTE* pBuffer, int nSize);
@@ -148,7 +148,7 @@ class CPinInfo : public PIN_INFO {
public:
CPinInfo() {
- pFilter = NULL;
+ pFilter = nullptr;
}
~CPinInfo() {
if (pFilter) {
@@ -161,7 +161,7 @@ class CFilterInfo : public FILTER_INFO {
public:
CFilterInfo() {
- pGraph = NULL;
+ pGraph = nullptr;
}
~CFilterInfo() {
if (pGraph) {
@@ -170,36 +170,36 @@ public: }
};
-#define BeginEnumFilters(pFilterGraph, pEnumFilters, pBaseFilter) \
-{ \
- CComPtr<IEnumFilters> pEnumFilters; \
- if (pFilterGraph && SUCCEEDED(pFilterGraph->EnumFilters(&pEnumFilters))) { \
- for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) {
+#define BeginEnumFilters(pFilterGraph, pEnumFilters, pBaseFilter) \
+{ \
+ CComPtr<IEnumFilters> pEnumFilters; \
+ if (pFilterGraph && SUCCEEDED(pFilterGraph->EnumFilters(&pEnumFilters))) { \
+ for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = nullptr) {
#define EndEnumFilters }}}
-#define BeginEnumCachedFilters(pGraphConfig, pEnumFilters, pBaseFilter) \
-{ \
- CComPtr<IEnumFilters> pEnumFilters; \
- if (pGraphConfig && SUCCEEDED(pGraphConfig->EnumCacheFilter(&pEnumFilters))) { \
- for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) {
+#define BeginEnumCachedFilters(pGraphConfig, pEnumFilters, pBaseFilter) \
+{ \
+ CComPtr<IEnumFilters> pEnumFilters; \
+ if (pGraphConfig && SUCCEEDED(pGraphConfig->EnumCacheFilter(&pEnumFilters))) { \
+ for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = nullptr) {
#define EndEnumCachedFilters }}}
-#define BeginEnumPins(pBaseFilter, pEnumPins, pPin) \
-{ \
- CComPtr<IEnumPins> pEnumPins; \
- if (pBaseFilter && SUCCEEDED(pBaseFilter->EnumPins(&pEnumPins))) { \
- for (CComPtr<IPin> pPin; S_OK == pEnumPins->Next(1, &pPin, 0); pPin = NULL) {
+#define BeginEnumPins(pBaseFilter, pEnumPins, pPin) \
+{ \
+ CComPtr<IEnumPins> pEnumPins; \
+ if (pBaseFilter && SUCCEEDED(pBaseFilter->EnumPins(&pEnumPins))) { \
+ for (CComPtr<IPin> pPin; S_OK == pEnumPins->Next(1, &pPin, 0); pPin = nullptr) {
#define EndEnumPins }}}
-#define BeginEnumMediaTypes(pPin, pEnumMediaTypes, pMediaType) \
-{ \
- CComPtr<IEnumMediaTypes> pEnumMediaTypes; \
- if (pPin && SUCCEEDED(pPin->EnumMediaTypes(&pEnumMediaTypes))) { \
- AM_MEDIA_TYPE* pMediaType = NULL; \
- for (; S_OK == pEnumMediaTypes->Next(1, &pMediaType, NULL); DeleteMediaType(pMediaType), pMediaType = NULL) {
+#define BeginEnumMediaTypes(pPin, pEnumMediaTypes, pMediaType) \
+{ \
+ CComPtr<IEnumMediaTypes> pEnumMediaTypes; \
+ if (pPin && SUCCEEDED(pPin->EnumMediaTypes(&pEnumMediaTypes))) { \
+ AM_MEDIA_TYPE* pMediaType = nullptr; \
+ for (; S_OK == pEnumMediaTypes->Next(1, &pMediaType, nullptr); DeleteMediaType(pMediaType), pMediaType = nullptr) {
#define EndEnumMediaTypes(pMediaType) \
} \
@@ -209,14 +209,14 @@ public: } \
}
-#define BeginEnumSysDev(clsid, pMoniker) \
-{ \
- CComPtr<ICreateDevEnum> pDevEnum4$##clsid; \
- pDevEnum4$##clsid.CoCreateInstance(CLSID_SystemDeviceEnum); \
- CComPtr<IEnumMoniker> pClassEnum4$##clsid; \
- if (SUCCEEDED(pDevEnum4$##clsid->CreateClassEnumerator(clsid, &pClassEnum4$##clsid, 0)) \
- && pClassEnum4$##clsid) { \
- for (CComPtr<IMoniker> pMoniker; pClassEnum4$##clsid->Next(1, &pMoniker, 0) == S_OK; pMoniker = NULL) {
+#define BeginEnumSysDev(clsid, pMoniker) \
+{ \
+ CComPtr<ICreateDevEnum> pDevEnum4$##clsid; \
+ pDevEnum4$##clsid.CoCreateInstance(CLSID_SystemDeviceEnum); \
+ CComPtr<IEnumMoniker> pClassEnum4$##clsid; \
+ if (SUCCEEDED(pDevEnum4$##clsid->CreateClassEnumerator(clsid, &pClassEnum4$##clsid, 0)) \
+ && pClassEnum4$##clsid) { \
+ for (CComPtr<IMoniker> pMoniker; pClassEnum4$##clsid->Next(1, &pMoniker, 0) == S_OK; pMoniker = nullptr) {
#define EndEnumSysDev }}}
@@ -236,7 +236,7 @@ public: #define ResumeGraph \
if (SUCCEEDED(_hr) && _pMS && _fs != State_Stopped) \
- _hr = _pMS->SetPositions(&_rtNow, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); \
+ _hr = _pMS->SetPositions(&_rtNow, AM_SEEKING_AbsolutePositioning, nullptr, AM_SEEKING_NoPositioning); \
\
if (_fs == State_Running && _pMS) \
_pMC->Run();
@@ -250,9 +250,9 @@ public: #define QI(i) (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :
#define QI2(i) (riid == IID_##i) ? GetInterface((i*)this, ppv) :
-#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = NULL; } }
-#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } }
+#define SAFE_DELETE(p) { if (p) { delete (p); (p) = nullptr; } }
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete [] (p); (p) = nullptr; } }
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = nullptr; } }
#define ResStr(id) CString(MAKEINTRESOURCE(id))
@@ -267,7 +267,7 @@ static CUnknown* WINAPI CreateInstance(LPUNKNOWN lpunk, HRESULT* phr) {
*phr = S_OK;
CUnknown* punk = DEBUG_NEW T(lpunk, phr);
- if (punk == NULL) {
+ if (punk == nullptr) {
*phr = E_OUTOFMEMORY;
}
return punk;
diff --git a/src/DSUtil/H264Nalu.h b/src/DSUtil/H264Nalu.h index e94a0745a..a393b225c 100644 --- a/src/DSUtil/H264Nalu.h +++ b/src/DSUtil/H264Nalu.h @@ -1,5 +1,5 @@ /*
- * (C) 2008-2012 see Authors.txt
+ * (C) 2008-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -61,7 +61,7 @@ public: forbidden_bit(0),
nal_reference_idc(0),
nal_unit_type() {
- SetBuffer(NULL, 0, 0);
+ SetBuffer(nullptr, 0, 0);
}
NALU_TYPE GetType() const { return nal_unit_type; };
diff --git a/src/DSUtil/HdmvClipInfo.h b/src/DSUtil/HdmvClipInfo.h index 30eae5e9a..af9cf4b0a 100644 --- a/src/DSUtil/HdmvClipInfo.h +++ b/src/DSUtil/HdmvClipInfo.h @@ -1,5 +1,5 @@ /*
- * (C) 2008-2012 see Authors.txt
+ * (C) 2008-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -124,7 +124,7 @@ public: Stream* FindStream(short wPID);
bool IsHdmv() const { return m_bIsHdmv; };
size_t GetStreamNumber() { return m_Streams.GetCount(); };
- Stream* GetStreamByIndex(size_t nIndex) { return (nIndex < m_Streams.GetCount()) ? &m_Streams[nIndex] : NULL; };
+ Stream* GetStreamByIndex(size_t nIndex) { return (nIndex < m_Streams.GetCount()) ? &m_Streams[nIndex] : nullptr; };
HRESULT FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile, CAtlList<PlaylistItem>& MainPlaylist, CAtlList<PlaylistItem>& MPLSPlaylists);
HRESULT ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtDuration, CAtlList<PlaylistItem>& Playlist);
diff --git a/src/DSUtil/MediaTypeEx.h b/src/DSUtil/MediaTypeEx.h index ffbecbbaa..e94b58a39 100644 --- a/src/DSUtil/MediaTypeEx.h +++ b/src/DSUtil/MediaTypeEx.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.
*
@@ -30,7 +30,7 @@ public: CMediaType::operator = (mt);
}
- CString ToString(IPin* pPin = NULL);
+ CString ToString(IPin* pPin = nullptr);
static CString GetVideoCodecName(const GUID& subtype, DWORD biCompression);
static CString GetAudioCodecName(const GUID& subtype, WORD wFormatTag);
diff --git a/src/DSUtil/NullRenderers.h b/src/DSUtil/NullRenderers.h index 629a707ff..a6935995b 100644 --- a/src/DSUtil/NullRenderers.h +++ b/src/DSUtil/NullRenderers.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.
*
@@ -91,5 +91,5 @@ class __declspec(uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC")) public:
CNullTextRenderer(LPUNKNOWN pUnk, HRESULT* phr);
int GetPinCount() { return (int)!!m_pInput; }
- CBasePin* GetPin(int n) { return n == 0 ? (CBasePin*)m_pInput : NULL; }
+ CBasePin* GetPin(int n) { return n == 0 ? (CBasePin*)m_pInput : nullptr; }
};
diff --git a/src/MPCTestAPI/MPCTestAPIDlg.h b/src/MPCTestAPI/MPCTestAPIDlg.h index 81b4326a7..9e8b3577b 100644 --- a/src/MPCTestAPI/MPCTestAPIDlg.h +++ b/src/MPCTestAPI/MPCTestAPIDlg.h @@ -1,5 +1,5 @@ /*
- * (C) 2008-2012 see Authors.txt
+ * (C) 2008-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -34,7 +34,7 @@ class CRegisterCopyDataDlg : public CDialog // Construction
public:
HWND m_RemoteWindow;
- CRegisterCopyDataDlg(CWnd* pParent = NULL); // standard constructor
+ CRegisterCopyDataDlg(CWnd* pParent = nullptr); // standard constructor
// Dialog Data
//{{AFX_DATA(CRegisterCopyDataDlg)
diff --git a/src/SubPic/CoordGeom.h b/src/SubPic/CoordGeom.h index cdc3bdee1..8c622a0ea 100644 --- a/src/SubPic/CoordGeom.h +++ b/src/SubPic/CoordGeom.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.
*
@@ -61,8 +61,8 @@ public: Vector Abs();
Vector Reflect(Vector& n);
- Vector Refract(Vector& n, float nFront, float nBack, float* nOut = NULL);
- Vector Refract2(Vector& n, float nFrom, float nTo, float* nOut = NULL);
+ Vector Refract(Vector& n, float nFront, float nBack, float* nOut = nullptr);
+ Vector Refract2(Vector& n, float nFrom, float nTo, float* nOut = nullptr);
Vector operator - ();
float& operator [](size_t i);
diff --git a/src/SubPic/DX9SubPic.h b/src/SubPic/DX9SubPic.h index b11bb3a5b..c659d114a 100644 --- a/src/SubPic/DX9SubPic.h +++ b/src/SubPic/DX9SubPic.h @@ -41,7 +41,7 @@ class CScopeLock void* m_pLock;
FLock* m_pUnlockFunc;
public:
- CScopeLock(): m_pLock(NULL), m_pUnlockFunc(NULL) {};
+ CScopeLock(): m_pLock(nullptr), m_pUnlockFunc(nullptr) {};
template <typename t_Lock>
class TCLocker
diff --git a/src/SubPic/ISubPic.h b/src/SubPic/ISubPic.h index b148c5ef5..812e9b0dc 100644 --- a/src/SubPic/ISubPic.h +++ b/src/SubPic/ISubPic.h @@ -37,8 +37,8 @@ struct SubPicDesc { struct SubPicDesc() {
type = 0;
w = h = bpp = pitch = pitchUV = 0;
- bits = NULL;
- bitsU = bitsV = NULL;
+ bits = nullptr;
+ bitsU = bitsV = nullptr;
}
};
#pragma pack(pop)
@@ -70,7 +70,7 @@ public IUnknown { STDMETHOD(Lock)(SubPicDesc& spd /*[out]*/) PURE;
STDMETHOD(Unlock)(RECT* pDirtyRect /*[in]*/) PURE;
- STDMETHOD(AlphaBlt)(RECT * pSrc, RECT * pDst, SubPicDesc* pTarget = NULL /*[in]*/) PURE;
+ STDMETHOD(AlphaBlt)(RECT * pSrc, RECT * pDst, SubPicDesc* pTarget = nullptr /*[in]*/) PURE;
STDMETHOD(GetSourceAndDest)(SIZE* pSize /*[in]*/, RECT* pRcSource /*[out]*/, RECT* pRcDest /*[out]*/) PURE;
STDMETHOD(SetVirtualTextureSize)(const SIZE pSize, const POINT pTopLeft) PURE;
diff --git a/src/SubPic/SubPicAllocatorPresenterImpl.h b/src/SubPic/SubPicAllocatorPresenterImpl.h index a367087e1..b86abb075 100644 --- a/src/SubPic/SubPicAllocatorPresenterImpl.h +++ b/src/SubPic/SubPicAllocatorPresenterImpl.h @@ -50,7 +50,7 @@ protected: bool m_bDeviceResetRequested;
bool m_bPendingResetDevice;
- void AlphaBltSubPic(CSize size, SubPicDesc* pTarget = NULL);
+ void AlphaBltSubPic(CSize size, SubPicDesc* pTarget = nullptr);
XForm m_xform;
void Transform(CRect r, Vector v[4]);
diff --git a/src/Subtitles/BaseSub.h b/src/Subtitles/BaseSub.h index 4cf08e4f3..c474c95cc 100644 --- a/src/Subtitles/BaseSub.h +++ b/src/Subtitles/BaseSub.h @@ -1,5 +1,5 @@ /*
- * (C) 2009-2012 see Authors.txt
+ * (C) 2009-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -36,15 +36,15 @@ public: CBaseSub(SUBTITLE_TYPE nType);
virtual ~CBaseSub();
- virtual HRESULT ParseSample(IMediaSample* pSample) = NULL;
+ virtual HRESULT ParseSample(IMediaSample* pSample) = 0;
virtual void EndOfStream() { /* Nothing to do */ };
- virtual void Reset() = NULL;
- virtual POSITION GetStartPosition(REFERENCE_TIME rt, double fps) = NULL;
- virtual POSITION GetNext(POSITION pos) = NULL;
- virtual REFERENCE_TIME GetStart(POSITION nPos) = NULL;
- virtual REFERENCE_TIME GetStop(POSITION nPos) = NULL;
- virtual void Render(SubPicDesc& spd, REFERENCE_TIME rt, RECT& bbox) = NULL;
- virtual HRESULT GetTextureSize(POSITION pos, SIZE& MaxTextureSize, SIZE& VideoSize, POINT& VideoTopLeft) = NULL;
+ virtual void Reset() = 0;
+ virtual POSITION GetStartPosition(REFERENCE_TIME rt, double fps) = 0;
+ virtual POSITION GetNext(POSITION pos) = 0;
+ virtual REFERENCE_TIME GetStart(POSITION nPos) = 0;
+ virtual REFERENCE_TIME GetStop(POSITION nPos) = 0;
+ virtual void Render(SubPicDesc& spd, REFERENCE_TIME rt, RECT& bbox) = 0;
+ virtual HRESULT GetTextureSize(POSITION pos, SIZE& MaxTextureSize, SIZE& VideoSize, POINT& VideoTopLeft) = 0;
protected:
SUBTITLE_TYPE m_nType;
diff --git a/src/Subtitles/CompositionObject.h b/src/Subtitles/CompositionObject.h index 09cb56127..1658bd069 100644 --- a/src/Subtitles/CompositionObject.h +++ b/src/Subtitles/CompositionObject.h @@ -1,5 +1,5 @@ /*
- * (C) 2009-2012 see Authors.txt
+ * (C) 2009-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -69,7 +69,7 @@ public: CompositionObject* Copy() {
CompositionObject* pCompositionObject = DEBUG_NEW CompositionObject(*this);
- pCompositionObject->m_pRLEData = NULL;
+ pCompositionObject->m_pRLEData = nullptr;
pCompositionObject->SetRLEData(m_pRLEData, m_nRLEDataSize, m_nRLEDataSize);
return pCompositionObject;
diff --git a/src/Subtitles/HdmvSub.h b/src/Subtitles/HdmvSub.h index 325963304..b47bc5e8a 100644 --- a/src/Subtitles/HdmvSub.h +++ b/src/Subtitles/HdmvSub.h @@ -108,11 +108,11 @@ public: virtual REFERENCE_TIME GetStart(POSITION nPos) {
HDMV_PRESENTATION_SEGMENT* pPresentationSegment = m_pPresentationSegments.GetAt(nPos);
- return pPresentationSegment != NULL ? pPresentationSegment->rtStart : INVALID_TIME;
+ return pPresentationSegment != nullptr ? pPresentationSegment->rtStart : INVALID_TIME;
};
virtual REFERENCE_TIME GetStop(POSITION nPos) {
HDMV_PRESENTATION_SEGMENT* pPresentationSegment = m_pPresentationSegments.GetAt(nPos);
- return pPresentationSegment != NULL ? pPresentationSegment->rtStop : INVALID_TIME;
+ return pPresentationSegment != nullptr ? pPresentationSegment->rtStop : INVALID_TIME;
};
void Render(SubPicDesc& spd, REFERENCE_TIME rt, RECT& bbox);
diff --git a/src/Subtitles/RTS.h b/src/Subtitles/RTS.h index 45284cdea..8456b55e3 100644 --- a/src/Subtitles/RTS.h +++ b/src/Subtitles/RTS.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.
*
@@ -242,16 +242,16 @@ protected: virtual void OnChanged();
public:
- CRenderedTextSubtitle(CCritSec* pLock, STSStyle* styleOverride = NULL, bool doOverride = false);
+ CRenderedTextSubtitle(CCritSec* pLock, STSStyle* styleOverride = nullptr, bool doOverride = false);
virtual ~CRenderedTextSubtitle();
virtual void Copy(CSimpleTextSubtitle& sts);
virtual void Empty();
// call to signal this RTS to ignore any of the styles and apply the given override style
- void SetOverride(bool doOverride = true, STSStyle* styleOverride = NULL) {
+ void SetOverride(bool doOverride = true, STSStyle* styleOverride = nullptr) {
m_doOverrideStyle = doOverride;
- if (styleOverride != NULL) {
+ if (styleOverride != nullptr) {
m_pStyleOverride = styleOverride;
}
}
diff --git a/src/Subtitles/STS.h b/src/Subtitles/STS.h index 0841e7f9a..c5d404ca9 100644 --- a/src/Subtitles/STS.h +++ b/src/Subtitles/STS.h @@ -184,9 +184,9 @@ public: int TranslateSegmentStart(int i, double fps);
int TranslateSegmentEnd(int i, double fps);
- const STSSegment* SearchSubs(int t, double fps, /*[out]*/ int* iSegment = NULL, int* nSegments = NULL);
+ const STSSegment* SearchSubs(int t, double fps, /*[out]*/ int* iSegment = nullptr, int* nSegments = nullptr);
const STSSegment* GetSegment(int iSegment) {
- return iSegment >= 0 && iSegment < (int)m_segments.GetCount() ? &m_segments[iSegment] : NULL;
+ return iSegment >= 0 && iSegment < (int)m_segments.GetCount() ? &m_segments[iSegment] : nullptr;
}
STSStyle* GetStyle(int i);
diff --git a/src/Subtitles/VobSubFileRipper.h b/src/Subtitles/VobSubFileRipper.h index cb41940e6..cd857c91e 100644 --- a/src/Subtitles/VobSubFileRipper.h +++ b/src/Subtitles/VobSubFileRipper.h @@ -113,7 +113,7 @@ protected: STDMETHODIMP OnFinished(bool fSucceeded) { return S_FALSE; }
public:
- IVSFRipperCallbackImpl() : CUnknown(NAME("IVSFRipperCallbackImpl"), NULL) {}
+ IVSFRipperCallbackImpl() : CUnknown(NAME("IVSFRipperCallbackImpl"), nullptr) {}
};
//
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 8e89d7c30..b6aa1c251 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.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.
*
@@ -109,7 +109,7 @@ public: REFERENCE_TIME rtStart, rtStop;
AM_MEDIA_TYPE* pmt;
Packet() {
- pmt = NULL;
+ pmt = nullptr;
bDiscontinuity = bAppendable = FALSE;
}
virtual ~Packet() {
@@ -261,7 +261,7 @@ public: // Queueing
HANDLE GetThreadHandle() {
- ASSERT(m_hThread != NULL);
+ ASSERT(m_hThread != nullptr);
return m_hThread;
}
void SetThreadPriority(int nPriority) {
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h index a7f8e80de..b91fe555e 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h @@ -415,28 +415,28 @@ public: bool Read(pshdr& h);
bool Read(pssyshdr& h);
bool Read(peshdr& h, BYTE code);
- bool Read(seqhdr& h, int len, CMediaType* pmt = NULL);
- bool Read(mpahdr& h, int len, bool fAllowV25, CMediaType* pmt = NULL);
- bool Read(aachdr& h, int len, CMediaType* pmt = NULL, MPEG_TYPES m_type = mpeg_es);
- bool Read(latm_aachdr& h, int len, CMediaType* pmt = NULL);
- bool Read(ac3hdr& h, int len, CMediaType* pmt = NULL, bool find_sync = true, bool AC3CoreOnly = true);
- bool Read(dtshdr& h, int len, CMediaType* pmt = NULL, bool find_sync = true);
- bool Read(lpcmhdr& h, CMediaType* pmt = NULL);
- bool Read(dvdalpcmhdr& h, int len, CMediaType* pmt = NULL);
- bool Read(hdmvlpcmhdr& h, CMediaType* pmt = NULL);
- bool Read(mlphdr& h, int len, CMediaType* pmt = NULL, bool find_sync = false);
- bool Read(dvdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(hdmvsubhdr& h, CMediaType* pmt = NULL, const char* language_code = NULL);
- bool Read(svcdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(cvdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(ps2audhdr& h, CMediaType* pmt = NULL);
- bool Read(ps2subhdr& h, CMediaType* pmt = NULL);
+ bool Read(seqhdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(mpahdr& h, int len, bool fAllowV25, CMediaType* pmt = nullptr);
+ bool Read(aachdr& h, int len, CMediaType* pmt = nullptr, MPEG_TYPES m_type = mpeg_es);
+ bool Read(latm_aachdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(ac3hdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = true, bool AC3CoreOnly = true);
+ bool Read(dtshdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = true);
+ bool Read(lpcmhdr& h, CMediaType* pmt = nullptr);
+ bool Read(dvdalpcmhdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(hdmvlpcmhdr& h, CMediaType* pmt = nullptr);
+ bool Read(mlphdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = false);
+ bool Read(dvdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(hdmvsubhdr& h, CMediaType* pmt = nullptr, const char* language_code = nullptr);
+ bool Read(svcdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(cvdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(ps2audhdr& h, CMediaType* pmt = nullptr);
+ bool Read(ps2subhdr& h, CMediaType* pmt = nullptr);
bool Read(tshdr& h, bool fSync = true);
bool Read(trsechdr& h);
bool Read(pvahdr& h, bool fSync = true);
- bool Read(avchdr& h, int len, CMediaType* pmt = NULL);
- bool Read(vc1hdr& h, int len, CMediaType* pmt = NULL, int guid_flag = 1);
- bool Read(dvbsub& h, int len, CMediaType* pmt = NULL);
+ bool Read(avchdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(vc1hdr& h, int len, CMediaType* pmt = nullptr, int guid_flag = 1);
+ bool Read(dvbsub& h, int len, CMediaType* pmt = nullptr);
bool Read(avchdr& h, spsppsindex index);
int HrdParameters(CGolombBuffer& gb);
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.h b/src/filters/parser/MpegSplitter/MpegSplitterFile.h index 37768c9ec..d76b5899c 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.h +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.h @@ -140,7 +140,7 @@ public: }
}
- return NULL;
+ return nullptr;
}
} m_streams[unknown];
diff --git a/src/filters/parser/OggSplitter/OggFile.h b/src/filters/parser/OggSplitter/OggFile.h index c5ed09218..b609e3be3 100644 --- a/src/filters/parser/OggSplitter/OggFile.h +++ b/src/filters/parser/OggSplitter/OggFile.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.
*
@@ -91,7 +91,7 @@ class COggFile : public CBaseSplitterFile public:
COggFile(IAsyncReader* pAsyncReader, HRESULT& hr);
- bool Sync(HANDLE hBreak = NULL);
- bool Read(OggPageHeader& hdr, HANDLE hBreak = NULL);
- bool Read(OggPage& page, bool fFull = true, HANDLE hBreak = NULL);
+ bool Sync(HANDLE hBreak = nullptr);
+ bool Read(OggPageHeader& hdr, HANDLE hBreak = nullptr);
+ bool Read(OggPage& page, bool fFull = true, HANDLE hBreak = nullptr);
};
diff --git a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h index 64a2789a5..061b76188 100644 --- a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h @@ -1,5 +1,5 @@ /*
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -35,7 +35,7 @@ namespace DSObjects public:
CSubRenderCallback(CDXRAllocatorPresenter* pDXRAP)
- : CUnknown(_T("CSubRender"), NULL)
+ : CUnknown(_T("CSubRender"), nullptr)
, m_pDXRAP(pDXRAP) {
}
diff --git a/src/filters/renderer/VideoRenderers/OuterVMR.h b/src/filters/renderer/VideoRenderers/OuterVMR.h index 658f1eaf4..48b9b9787 100644 --- a/src/filters/renderer/VideoRenderers/OuterVMR.h +++ b/src/filters/renderer/VideoRenderers/OuterVMR.h @@ -1,5 +1,5 @@ /*
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -43,7 +43,7 @@ namespace DSObjects }
~COuterVMR9() {
- m_pVMR = NULL;
+ m_pVMR = nullptr;
}
DECLARE_IUNKNOWN;
diff --git a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.h b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.h index e408a1de8..7a1c5c058 100644 --- a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.h +++ b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.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.
*
@@ -59,6 +59,6 @@ public: LPCSTR pProfile,
DWORD Flags,
IDirect3DPixelShader9** ppPixelShader,
- CString* disasm = NULL,
- CString* errmsg = NULL);
+ CString* disasm = nullptr,
+ CString* errmsg = nullptr);
};
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h index 4e218f4a2..bed41153e 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h @@ -1,5 +1,5 @@ /*
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -42,7 +42,7 @@ namespace DSObjects public:
CSubRenderCallback(CmadVRAllocatorPresenter* pDXRAP)
- : CUnknown(_T("CSubRender"), NULL)
+ : CUnknown(_T("CSubRender"), nullptr)
, m_pDXRAP(pDXRAP) {
}
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.h b/src/filters/source/ShoutcastSource/ShoutcastSource.h index e787019da..b8ddc6d26 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.h +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.h @@ -95,7 +95,7 @@ class CShoutcastStream : public CSourceStream CString title;
mp3frame(DWORD len = 0) {
this->len = len;
- pData = len ? DEBUG_NEW BYTE[len] : NULL;
+ pData = len ? DEBUG_NEW BYTE[len] : nullptr;
rtStart = rtStop = 0;
}
mp3frame(const mp3frame& f) { *this = f; }
@@ -107,7 +107,7 @@ class CShoutcastStream : public CSourceStream rtStart = f.rtStart;
rtStop = f.rtStop;
title = f.title;
- ((mp3frame*)&f)->pData = NULL;
+ ((mp3frame*)&f)->pData = nullptr;
}
return *this;
}
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.h b/src/filters/transform/MPCVideoDec/DXVADecoder.h index 8595c1f96..638432a03 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoder.h +++ b/src/filters/transform/MPCVideoDec/DXVADecoder.h @@ -1,5 +1,5 @@ /*
- * (C) 2007-2012 see Authors.txt
+ * (C) 2007-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -76,7 +76,7 @@ public: m_pDirectXVideoDec = pDirectXVideoDec;
};
- virtual HRESULT DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop) = NULL;
+ virtual HRESULT DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop) = 0;
virtual void SetExtraData(BYTE* pDataIn, UINT nSize);
virtual void CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nSize);
virtual void Flush();
@@ -109,7 +109,7 @@ protected: bool m_bNeedChangeAspect;
// === DXVA functions
- HRESULT AddExecuteBuffer(DWORD CompressedBufferType, UINT nSize, void* pBuffer, UINT* pRealSize = NULL);
+ HRESULT AddExecuteBuffer(DWORD CompressedBufferType, UINT nSize, void* pBuffer, UINT* pRealSize = nullptr);
HRESULT GetDeliveryBuffer(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, IMediaSample** ppSampleToDeliver);
HRESULT Execute();
DWORD GetDXVA1CompressedType(DWORD dwDXVA2CompressedType);
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h index 8d1908a9a..a676f4fbb 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h @@ -64,7 +64,7 @@ class __declspec(uuid("39F498AF-1A09-4275-B193-673B0BA3D478")) framebuf()
: di(DIAuto) {
w = h = pitch = 0;
- buf_base = NULL;
+ buf_base = nullptr;
memset(&buf, 0, sizeof(buf));
rtStart = rtStop = 0;
flags = 0;
@@ -97,7 +97,7 @@ class __declspec(uuid("39F498AF-1A09-4275-B193-673B0BA3D478")) if (buf_base) {
_aligned_free(buf_base);
}
- buf_base = NULL;
+ buf_base = nullptr;
}
} m_fb;
diff --git a/src/filters/transform/VSFilter/StyleEditorDialog.h b/src/filters/transform/VSFilter/StyleEditorDialog.h index 55ab21720..20935c239 100644 --- a/src/filters/transform/VSFilter/StyleEditorDialog.h +++ b/src/filters/transform/VSFilter/StyleEditorDialog.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.
*
@@ -34,7 +34,7 @@ class CColorStatic : public CStatic COLORREF* m_pColor;
public:
- CColorStatic(CWnd* pParent = NULL) : m_pColor(NULL) {}
+ CColorStatic(CWnd* pParent = nullptr) : m_pColor(nullptr) {}
virtual ~CColorStatic() {}
void SetColorPtr(COLORREF* pColor) { m_pColor = pColor; }
@@ -62,7 +62,7 @@ class CStyleEditorDialog : public CDialog void AskColor(int i);
public:
- CStyleEditorDialog(CString title, STSStyle* pstss, CWnd* pParent = NULL); // standard constructor
+ CStyleEditorDialog(CString title, STSStyle* pstss, CWnd* pParent = nullptr); // standard constructor
virtual ~CStyleEditorDialog();
// Dialog Data
diff --git a/src/mpc-hc/AuthDlg.h b/src/mpc-hc/AuthDlg.h index 1fd139041..4bb04f796 100644 --- a/src/mpc-hc/AuthDlg.h +++ b/src/mpc-hc/AuthDlg.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.
*
@@ -36,7 +36,7 @@ private: CMapStringToString m_logins;
public:
- CAuthDlg(CWnd* pParent = NULL); // standard constructor
+ CAuthDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CAuthDlg();
// Dialog Data
diff --git a/src/mpc-hc/CShockwaveFlash.h b/src/mpc-hc/CShockwaveFlash.h index 1b9ee2ac1..ed89145c2 100644 --- a/src/mpc-hc/CShockwaveFlash.h +++ b/src/mpc-hc/CShockwaveFlash.h @@ -36,13 +36,13 @@ public: }
virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle,
const RECT& rect, CWnd* pParentWnd, UINT nID,
- CCreateContext* pContext = NULL) {
+ CCreateContext* pContext = nullptr) {
return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID);
}
BOOL Create(LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd,
- UINT nID, CFile* pPersist = NULL, BOOL bStorage = FALSE,
- BSTR bstrLicKey = NULL) {
+ UINT nID, CFile* pPersist = nullptr, BOOL bStorage = FALSE,
+ BSTR bstrLicKey = nullptr) {
return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID,
pPersist, bStorage, bstrLicKey);
}
@@ -55,133 +55,133 @@ public: long get_ReadyState() {
long result;
- InvokeHelper(DISPID_READYSTATE, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(DISPID_READYSTATE, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
long get_TotalFrames() {
long result;
- InvokeHelper(0x7c, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x7c, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
BOOL get_Playing() {
BOOL result;
- InvokeHelper(0x7d, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x7d, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, nullptr);
return result;
}
void put_Playing(BOOL newValue) {
static BYTE parms[] = VTS_BOOL;
- InvokeHelper(0x7d, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x7d, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
long get_Quality() {
long result;
- InvokeHelper(0x69, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x69, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
void put_Quality(long newValue) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x69, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x69, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
long get_ScaleMode() {
long result;
- InvokeHelper(0x78, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x78, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
void put_ScaleMode(long newValue) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x78, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x78, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
long get_AlignMode() {
long result;
- InvokeHelper(0x79, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x79, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
void put_AlignMode(long newValue) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x79, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x79, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
long get_BackgroundColor() {
long result;
- InvokeHelper(0x7b, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x7b, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
void put_BackgroundColor(long newValue) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x7b, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x7b, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
BOOL get_Loop() {
BOOL result;
- InvokeHelper(0x6a, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x6a, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, nullptr);
return result;
}
void put_Loop(BOOL newValue) {
static BYTE parms[] = VTS_BOOL;
- InvokeHelper(0x6a, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x6a, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_Movie() {
CString result;
- InvokeHelper(0x66, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x66, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_Movie(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x66, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x66, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
long get_FrameNum() {
long result;
- InvokeHelper(0x6b, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x6b, DISPATCH_PROPERTYGET, VT_I4, (void*)&result, nullptr);
return result;
}
void put_FrameNum(long newValue) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x6b, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x6b, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
void SetZoomRect(long left, long top, long right, long bottom) {
static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4;
- InvokeHelper(0x6d, DISPATCH_METHOD, VT_EMPTY, NULL, parms, left, top, right, bottom);
+ InvokeHelper(0x6d, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, left, top, right, bottom);
}
void Zoom(long factor) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x76, DISPATCH_METHOD, VT_EMPTY, NULL, parms, factor);
+ InvokeHelper(0x76, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, factor);
}
void Pan(long x, long y, long mode) {
static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4;
- InvokeHelper(0x77, DISPATCH_METHOD, VT_EMPTY, NULL, parms, x, y, mode);
+ InvokeHelper(0x77, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, x, y, mode);
}
void Play() {
- InvokeHelper(0x70, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x70, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void Stop() {
- InvokeHelper(0x71, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x71, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void Back() {
- InvokeHelper(0x72, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x72, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void Forward() {
- InvokeHelper(0x73, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x73, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void Rewind() {
- InvokeHelper(0x74, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x74, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void StopPlay() {
- InvokeHelper(0x7e, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ InvokeHelper(0x7e, DISPATCH_METHOD, VT_EMPTY, nullptr, nullptr);
}
void GotoFrame(long FrameNum) {
static BYTE parms[] = VTS_I4;
- InvokeHelper(0x7f, DISPATCH_METHOD, VT_EMPTY, NULL, parms, FrameNum);
+ InvokeHelper(0x7f, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, FrameNum);
}
long CurrentFrame() {
long result;
- InvokeHelper(0x80, DISPATCH_METHOD, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x80, DISPATCH_METHOD, VT_I4, (void*)&result, nullptr);
return result;
}
BOOL IsPlaying() {
BOOL result;
- InvokeHelper(0x81, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x81, DISPATCH_METHOD, VT_BOOL, (void*)&result, nullptr);
return result;
}
long PercentLoaded() {
long result;
- InvokeHelper(0x82, DISPATCH_METHOD, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x82, DISPATCH_METHOD, VT_I4, (void*)&result, nullptr);
return result;
}
BOOL FrameLoaded(long FrameNum) {
@@ -192,101 +192,101 @@ public: }
long FlashVersion() {
long result;
- InvokeHelper(0x84, DISPATCH_METHOD, VT_I4, (void*)&result, NULL);
+ InvokeHelper(0x84, DISPATCH_METHOD, VT_I4, (void*)&result, nullptr);
return result;
}
CString get_WMode() {
CString result;
- InvokeHelper(0x85, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x85, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_WMode(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x85, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x85, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_SAlign() {
CString result;
- InvokeHelper(0x86, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x86, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_SAlign(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x86, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x86, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
BOOL get_Menu() {
BOOL result;
- InvokeHelper(0x87, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x87, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, nullptr);
return result;
}
void put_Menu(BOOL newValue) {
static BYTE parms[] = VTS_BOOL;
- InvokeHelper(0x87, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x87, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_Base() {
CString result;
- InvokeHelper(0x88, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x88, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_Base(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x88, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x88, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_Scale() {
CString result;
- InvokeHelper(0x89, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x89, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_Scale(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x89, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x89, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
BOOL get_DeviceFont() {
BOOL result;
- InvokeHelper(0x8a, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x8a, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, nullptr);
return result;
}
void put_DeviceFont(BOOL newValue) {
static BYTE parms[] = VTS_BOOL;
- InvokeHelper(0x8a, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x8a, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
BOOL get_EmbedMovie() {
BOOL result;
- InvokeHelper(0x8b, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, NULL);
+ InvokeHelper(0x8b, DISPATCH_PROPERTYGET, VT_BOOL, (void*)&result, nullptr);
return result;
}
void put_EmbedMovie(BOOL newValue) {
static BYTE parms[] = VTS_BOOL;
- InvokeHelper(0x8b, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x8b, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_BGColor() {
CString result;
- InvokeHelper(0x8c, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x8c, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_BGColor(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x8c, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x8c, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_Quality2() {
CString result;
- InvokeHelper(0x8d, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x8d, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_Quality2(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x8d, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x8d, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
void LoadMovie(long layer, LPCTSTR url) {
static BYTE parms[] = VTS_I4 VTS_BSTR;
- InvokeHelper(0x8e, DISPATCH_METHOD, VT_EMPTY, NULL, parms, layer, url);
+ InvokeHelper(0x8e, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, layer, url);
}
void TGotoFrame(LPCTSTR target, long FrameNum) {
static BYTE parms[] = VTS_BSTR VTS_I4;
- InvokeHelper(0x8f, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, FrameNum);
+ InvokeHelper(0x8f, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, FrameNum);
}
void TGotoLabel(LPCTSTR target, LPCTSTR label) {
static BYTE parms[] = VTS_BSTR VTS_BSTR;
- InvokeHelper(0x90, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, label);
+ InvokeHelper(0x90, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, label);
}
long TCurrentFrame(LPCTSTR target) {
long result;
@@ -302,15 +302,15 @@ public: }
void TPlay(LPCTSTR target) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x93, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target);
+ InvokeHelper(0x93, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target);
}
void TStopPlay(LPCTSTR target) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x94, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target);
+ InvokeHelper(0x94, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target);
}
void SetVariable(LPCTSTR name, LPCTSTR value) {
static BYTE parms[] = VTS_BSTR VTS_BSTR;
- InvokeHelper(0x97, DISPATCH_METHOD, VT_EMPTY, NULL, parms, name, value);
+ InvokeHelper(0x97, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, name, value);
}
CString GetVariable(LPCTSTR name) {
CString result;
@@ -320,7 +320,7 @@ public: }
void TSetProperty(LPCTSTR target, long property, LPCTSTR value) {
static BYTE parms[] = VTS_BSTR VTS_I4 VTS_BSTR;
- InvokeHelper(0x99, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, property, value);
+ InvokeHelper(0x99, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, property, value);
}
CString TGetProperty(LPCTSTR target, long property) {
CString result;
@@ -330,15 +330,15 @@ public: }
void TCallFrame(LPCTSTR target, long FrameNum) {
static BYTE parms[] = VTS_BSTR VTS_I4;
- InvokeHelper(0x9b, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, FrameNum);
+ InvokeHelper(0x9b, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, FrameNum);
}
void TCallLabel(LPCTSTR target, LPCTSTR label) {
static BYTE parms[] = VTS_BSTR VTS_BSTR;
- InvokeHelper(0x9c, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, label);
+ InvokeHelper(0x9c, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, label);
}
void TSetPropertyNum(LPCTSTR target, long property, double value) {
static BYTE parms[] = VTS_BSTR VTS_I4 VTS_R8;
- InvokeHelper(0x9d, DISPATCH_METHOD, VT_EMPTY, NULL, parms, target, property, value);
+ InvokeHelper(0x9d, DISPATCH_METHOD, VT_EMPTY, nullptr, parms, target, property, value);
}
double TGetPropertyNum(LPCTSTR target, long property) {
double result;
@@ -354,30 +354,30 @@ public: }
CString get_SWRemote() {
CString result;
- InvokeHelper(0x9f, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0x9f, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_SWRemote(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0x9f, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0x9f, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_FlashVars() {
CString result;
- InvokeHelper(0xaa, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0xaa, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_FlashVars(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0xaa, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0xaa, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
CString get_AllowScriptAccess() {
CString result;
- InvokeHelper(0xab, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, NULL);
+ InvokeHelper(0xab, DISPATCH_PROPERTYGET, VT_BSTR, (void*)&result, nullptr);
return result;
}
void put_AllowScriptAccess(LPCTSTR newValue) {
static BYTE parms[] = VTS_BSTR;
- InvokeHelper(0xab, DISPATCH_PROPERTYPUT, VT_EMPTY, NULL, parms, newValue);
+ InvokeHelper(0xab, DISPATCH_PROPERTYPUT, VT_EMPTY, nullptr, parms, newValue);
}
};
diff --git a/src/mpc-hc/ComPropertySheet.h b/src/mpc-hc/ComPropertySheet.h index e1d51ac53..793e543a3 100644 --- a/src/mpc-hc/ComPropertySheet.h +++ b/src/mpc-hc/ComPropertySheet.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,8 +40,8 @@ class CComPropertySheet : public CPropertySheet, public IComPropertyPageDirty CSize m_size;
public:
- CComPropertySheet(UINT nIDCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
- CComPropertySheet(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
+ CComPropertySheet(UINT nIDCaption, CWnd* pParentWnd = nullptr, UINT iSelectPage = 0);
+ CComPropertySheet(LPCTSTR pszCaption, CWnd* pParentWnd = nullptr, UINT iSelectPage = 0);
virtual ~CComPropertySheet();
int AddPages(ISpecifyPropertyPages* pSPP);
diff --git a/src/mpc-hc/FGFilter.h b/src/mpc-hc/FGFilter.h index 1cd769be0..53f251327 100644 --- a/src/mpc-hc/FGFilter.h +++ b/src/mpc-hc/FGFilter.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.
*
@@ -94,7 +94,7 @@ public: CheckPointer(ppBF, E_POINTER);
HRESULT hr = S_OK;
- CComPtr<IBaseFilter> pBF = DEBUG_NEW T(NULL, &hr);
+ CComPtr<IBaseFilter> pBF = DEBUG_NEW T(nullptr, &hr);
if (FAILED(hr)) {
return hr;
}
diff --git a/src/mpc-hc/FakeFilterMapper2.h b/src/mpc-hc/FakeFilterMapper2.h index f49841405..0d086b40b 100644 --- a/src/mpc-hc/FakeFilterMapper2.h +++ b/src/mpc-hc/FakeFilterMapper2.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.
*
@@ -117,7 +117,7 @@ protected: BOOL bOutputNeeded, DWORD cOutputTypes, const GUID* pOutputTypes, const REGPINMEDIUM* pMedOut, const CLSID* pPinCategoryOut);
public:
- CFilterMapper2(bool fRefCounted, bool fAllowUnreg = false, LPUNKNOWN pUnkOuter = NULL);
+ CFilterMapper2(bool fRefCounted, bool fAllowUnreg = false, LPUNKNOWN pUnkOuter = nullptr);
virtual ~CFilterMapper2();
void SetInner(IUnknown* pUnk) { m_pFM2 = pUnk; }
diff --git a/src/mpc-hc/FavoriteAddDlg.h b/src/mpc-hc/FavoriteAddDlg.h index 4bcdf6012..5501f7e5c 100644 --- a/src/mpc-hc/FavoriteAddDlg.h +++ b/src/mpc-hc/FavoriteAddDlg.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.
*
@@ -34,7 +34,7 @@ private: CString m_shortname, m_fullname;
public:
- CFavoriteAddDlg(CString shortname, CString fullname, CWnd* pParent = NULL); // standard constructor
+ CFavoriteAddDlg(CString shortname, CString fullname, CWnd* pParent = nullptr); // standard constructor
virtual ~CFavoriteAddDlg();
// Dialog Data
diff --git a/src/mpc-hc/FavoriteOrganizeDlg.h b/src/mpc-hc/FavoriteOrganizeDlg.h index 521324fd3..bda98bef3 100644 --- a/src/mpc-hc/FavoriteOrganizeDlg.h +++ b/src/mpc-hc/FavoriteOrganizeDlg.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.
*
@@ -36,7 +36,7 @@ private: CAtlList<CString> m_sl[3];
public:
- CFavoriteOrganizeDlg(CWnd* pParent = NULL); // standard constructor
+ CFavoriteOrganizeDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CFavoriteOrganizeDlg();
virtual BOOL PreTranslateMessage(MSG* pMsg);
diff --git a/src/mpc-hc/GoToDlg.h b/src/mpc-hc/GoToDlg.h index 07fed1daf..9b3a17388 100644 --- a/src/mpc-hc/GoToDlg.h +++ b/src/mpc-hc/GoToDlg.h @@ -35,7 +35,7 @@ class CGoToDlg : public CDialog enum { TYPE_TIME, TYPE_FRAME };
public:
- CGoToDlg(REFERENCE_TIME time = -1, REFERENCE_TIME maxTime = -1, double fps = 0, CWnd* pParent = NULL); // standard constructor
+ CGoToDlg(REFERENCE_TIME time = -1, REFERENCE_TIME maxTime = -1, double fps = 0, CWnd* pParent = nullptr); // standard constructor
virtual ~CGoToDlg();
CString m_timestr;
diff --git a/src/mpc-hc/GraphThread.h b/src/mpc-hc/GraphThread.h index fe10a9e7c..4c87e3dcb 100644 --- a/src/mpc-hc/GraphThread.h +++ b/src/mpc-hc/GraphThread.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.
*
@@ -27,7 +27,7 @@ class CGraphThread : public CWinThread {
DECLARE_DYNCREATE(CGraphThread);
public:
- CGraphThread() : m_pMainFrame(NULL) {}
+ CGraphThread() : m_pMainFrame(nullptr) {}
BOOL InitInstance();
int ExitInstance();
diff --git a/src/mpc-hc/MPCPngImage.h b/src/mpc-hc/MPCPngImage.h index f37aac387..ef0578b0a 100644 --- a/src/mpc-hc/MPCPngImage.h +++ b/src/mpc-hc/MPCPngImage.h @@ -15,8 +15,8 @@ protected: // Operations:
public:
- BOOL Load(UINT uiResID, HINSTANCE hinstRes = NULL);
- BOOL Load(LPCTSTR lpszResourceName, HINSTANCE hinstRes = NULL);
+ BOOL Load(UINT uiResID, HINSTANCE hinstRes = nullptr);
+ BOOL Load(LPCTSTR lpszResourceName, HINSTANCE hinstRes = nullptr);
BOOL LoadFromFile(LPCTSTR lpszPath);
BOOL LoadFromBuffer(LPBYTE lpBuffer, UINT uiSize);
diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 228f7b3ea..86abcfcb2 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -457,7 +457,7 @@ public: DWORD SetupAudioStreams();
DWORD SetupSubtitleStreams();
- bool LoadSubtitle(CString fn, ISubStream** actualStream = NULL, bool bAutoLoad = false);
+ bool LoadSubtitle(CString fn, ISubStream** actualStream = nullptr, bool bAutoLoad = false);
bool SetSubtitle(int i, bool bIsOffset = false, bool bDisplayMessage = false, bool bApplyDefStyle = false);
void SetSubtitle(ISubStream* pSubStream, bool bApplyDefStyle = false);
void ToggleSubtitleOnOff(bool bDisplayMessage = false);
diff --git a/src/mpc-hc/MediaFormats.h b/src/mpc-hc/MediaFormats.h index 6ab490d31..4b06875ed 100644 --- a/src/mpc-hc/MediaFormats.h +++ b/src/mpc-hc/MediaFormats.h @@ -54,7 +54,7 @@ public: void SetExts(CString exts);
bool FindExt(CString ext) const {
- return m_exts.Find(ext.TrimLeft(_T('.')).MakeLower()) != NULL;
+ return m_exts.Find(ext.TrimLeft(_T('.')).MakeLower()) != nullptr;
}
CString GetLabel() const { return m_label; }
diff --git a/src/mpc-hc/MediaPositionList.h b/src/mpc-hc/MediaPositionList.h index 721f1564a..8d0a6c15a 100644 --- a/src/mpc-hc/MediaPositionList.h +++ b/src/mpc-hc/MediaPositionList.h @@ -54,7 +54,7 @@ public: virtual void Empty() = 0; T* GetLatestEntry() { - return !IsEmpty() ? &GetHead() : NULL; + return !IsEmpty() ? &GetHead() : nullptr; }; }; diff --git a/src/mpc-hc/MediaTypesDlg.h b/src/mpc-hc/MediaTypesDlg.h index bb7963f31..6fdfb043e 100644 --- a/src/mpc-hc/MediaTypesDlg.h +++ b/src/mpc-hc/MediaTypesDlg.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.
*
@@ -41,7 +41,7 @@ private: void AddMediaType(AM_MEDIA_TYPE* pmt);
public:
- CMediaTypesDlg(IGraphBuilderDeadEnd* pGBDE, CWnd* pParent = NULL); // standard constructor
+ CMediaTypesDlg(IGraphBuilderDeadEnd* pGBDE, CWnd* pParent = nullptr); // standard constructor
virtual ~CMediaTypesDlg();
// Dialog Data
diff --git a/src/mpc-hc/OpenDlg.h b/src/mpc-hc/OpenDlg.h index 0586aad03..6b2279c8a 100644 --- a/src/mpc-hc/OpenDlg.h +++ b/src/mpc-hc/OpenDlg.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.
*
@@ -32,7 +32,7 @@ class COpenDlg : public CResizableDialog // DECLARE_DYNAMIC(COpenDlg)
public:
- COpenDlg(CWnd* pParent = NULL); // standard constructor
+ COpenDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~COpenDlg();
bool m_fMultipleFiles;
diff --git a/src/mpc-hc/OpenFileDlg.h b/src/mpc-hc/OpenFileDlg.h index 24765964f..5084ff4d4 100644 --- a/src/mpc-hc/OpenFileDlg.h +++ b/src/mpc-hc/OpenFileDlg.h @@ -37,11 +37,11 @@ private: public:
COpenFileDlg(CAtlArray<CString>& mask, bool fAllowDirSelection,
- LPCTSTR lpszDefExt = NULL,
- LPCTSTR lpszFileName = NULL,
+ LPCTSTR lpszDefExt = nullptr,
+ LPCTSTR lpszFileName = nullptr,
DWORD dwFlags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
- LPCTSTR lpszFilter = NULL,
- CWnd* pParentWnd = NULL);
+ LPCTSTR lpszFilter = nullptr,
+ CWnd* pParentWnd = nullptr);
virtual ~COpenFileDlg();
static bool m_fAllowDirSelection;
diff --git a/src/mpc-hc/PPageSubStyle.h b/src/mpc-hc/PPageSubStyle.h index 88ffea0ca..5f393d023 100644 --- a/src/mpc-hc/PPageSubStyle.h +++ b/src/mpc-hc/PPageSubStyle.h @@ -30,7 +30,7 @@ class CColorStatic : public CStatic COLORREF* m_pColor;
public:
- CColorStatic(CWnd* pParent = NULL) : m_pColor(NULL) {}
+ CColorStatic(CWnd* pParent = nullptr) : m_pColor(nullptr) {}
virtual ~CColorStatic() {}
void SetColorPtr(COLORREF* pColor) { m_pColor = pColor; }
diff --git a/src/mpc-hc/PlayerCaptureDialog.h b/src/mpc-hc/PlayerCaptureDialog.h index ac12607d3..38db649a1 100644 --- a/src/mpc-hc/PlayerCaptureDialog.h +++ b/src/mpc-hc/PlayerCaptureDialog.h @@ -70,7 +70,7 @@ public: return tmp;
}
- return NULL;
+ return nullptr;
}
bool FindFormat(AM_MEDIA_TYPE* pmt, CFormat<T>** ppf) {
@@ -123,7 +123,7 @@ public: return false;
}
- if (FindFormat(pmt, NULL, NULL, NULL)) {
+ if (FindFormat(pmt, nullptr, nullptr, nullptr)) {
DeleteMediaType(pmt);
return false;
}
@@ -172,7 +172,7 @@ public: ? &((VIDEOINFOHEADER*)pmt->pbFormat)->bmiHeader
: (pmt->formattype == FORMAT_VideoInfo2)
? &((VIDEOINFOHEADER2*)pmt->pbFormat)->bmiHeader
- : NULL;
+ : nullptr;
if (!bih) {
// it may have a fourcc in the mediasubtype, let's check that
@@ -234,9 +234,9 @@ public: ? &((VIDEOINFOHEADER*)pfe->mt.pbFormat)->bmiHeader
: (pfe->mt.formattype == FORMAT_VideoInfo2)
? &((VIDEOINFOHEADER2*)pfe->mt.pbFormat)->bmiHeader
- : NULL;
+ : nullptr;
- if (bih == NULL) {
+ if (bih == nullptr) {
return str;
}
@@ -268,7 +268,7 @@ public: WAVEFORMATEX* wfe = (pmt->formattype == FORMAT_WaveFormatEx)
? (WAVEFORMATEX*)pmt->pbFormat
- : NULL;
+ : nullptr;
if (!wfe) {
WCHAR guid[100];
@@ -303,7 +303,7 @@ public: WAVEFORMATEX* wfe = (pfe->mt.formattype == FORMAT_WaveFormatEx)
? (WAVEFORMATEX*)pfe->mt.pbFormat
- : NULL;
+ : nullptr;
if (!wfe) {
return str;
@@ -398,7 +398,7 @@ public: CPlayerCaptureDialog(); // standard constructor
virtual ~CPlayerCaptureDialog();
- BOOL Create(CWnd* pParent = NULL);
+ BOOL Create(CWnd* pParent = nullptr);
// Dialog Data
enum { IDD = IDD_CAPTURE_DLG };
diff --git a/src/mpc-hc/PlayerNavigationDialog.h b/src/mpc-hc/PlayerNavigationDialog.h index 769921a50..0e22c6b3d 100644 --- a/src/mpc-hc/PlayerNavigationDialog.h +++ b/src/mpc-hc/PlayerNavigationDialog.h @@ -40,7 +40,7 @@ public: CPlayerNavigationDialog(); // standard constructor
virtual ~CPlayerNavigationDialog();
- BOOL Create(CWnd* pParent = NULL);
+ BOOL Create(CWnd* pParent = nullptr);
void UpdateElementList();
void UpdatePos(int nID);
int p_nItems[MAX_CHANNELS_ALLOWED];
diff --git a/src/mpc-hc/PlayerPlaylistBar.h b/src/mpc-hc/PlayerPlaylistBar.h index a96e88d2b..524438d8d 100644 --- a/src/mpc-hc/PlayerPlaylistBar.h +++ b/src/mpc-hc/PlayerPlaylistBar.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,8 +100,8 @@ public: void Refresh();
bool Empty();
- void Open(CAtlList<CString>& fns, bool fMulti, CAtlList<CString>* subs = NULL);
- void Append(CAtlList<CString>& fns, bool fMulti, CAtlList<CString>* subs = NULL);
+ void Open(CAtlList<CString>& fns, bool fMulti, CAtlList<CString>* subs = nullptr);
+ void Append(CAtlList<CString>& fns, bool fMulti, CAtlList<CString>* subs = nullptr);
void Open(CStringW vdn, CStringW adn, int vinput, int vchannel, int ainput);
void Append(CStringW vdn, CStringW adn, int vinput, int vchannel, int ainput);
diff --git a/src/mpc-hc/PnSPresetsDlg.h b/src/mpc-hc/PnSPresetsDlg.h index f65c8a2e5..af349bc19 100644 --- a/src/mpc-hc/PnSPresetsDlg.h +++ b/src/mpc-hc/PnSPresetsDlg.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.
*
@@ -38,7 +38,7 @@ private: double ZoomX, double ZoomY);
public:
- CPnSPresetsDlg(CWnd* pParent = NULL); // standard constructor
+ CPnSPresetsDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CPnSPresetsDlg();
CStringArray m_pnspresets;
diff --git a/src/mpc-hc/RealMediaWindowlessSite.h b/src/mpc-hc/RealMediaWindowlessSite.h index d2f7a2ba6..ed7cc72b0 100644 --- a/src/mpc-hc/RealMediaWindowlessSite.h +++ b/src/mpc-hc/RealMediaWindowlessSite.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.
*
@@ -141,7 +141,7 @@ namespace DSObjects void SetInternalZOrder(INT32 lZOrder);
public:
- CRealMediaWindowlessSite(HRESULT& hr, IUnknown* pContext, CRealMediaWindowlessSite* pParentSite = NULL, IUnknown* pUnkOuter = NULL);
+ CRealMediaWindowlessSite(HRESULT& hr, IUnknown* pContext, CRealMediaWindowlessSite* pParentSite = nullptr, IUnknown* pUnkOuter = nullptr);
virtual ~CRealMediaWindowlessSite();
DECLARE_IUNKNOWN;
diff --git a/src/mpc-hc/RegFilterChooserDlg.h b/src/mpc-hc/RegFilterChooserDlg.h index f23ca27bd..db424ae0d 100644 --- a/src/mpc-hc/RegFilterChooserDlg.h +++ b/src/mpc-hc/RegFilterChooserDlg.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.
*
@@ -35,7 +35,7 @@ class CRegFilterChooserDlg : public CResizableDialog void AddToList(IMoniker* pMoniker);
public:
- CRegFilterChooserDlg(CWnd* pParent = NULL); // standard constructor
+ CRegFilterChooserDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CRegFilterChooserDlg();
CList<FilterOverride*> m_filters;
diff --git a/src/mpc-hc/SaveDlg.h b/src/mpc-hc/SaveDlg.h index ba48cf0d7..7295fbf01 100644 --- a/src/mpc-hc/SaveDlg.h +++ b/src/mpc-hc/SaveDlg.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.
*
@@ -41,7 +41,7 @@ private: UINT_PTR m_nIDTimerEvent;
public:
- CSaveDlg(CString in, CString out, CWnd* pParent = NULL); // standard constructor
+ CSaveDlg(CString in, CString out, CWnd* pParent = nullptr); // standard constructor
virtual ~CSaveDlg();
// Dialog Data
diff --git a/src/mpc-hc/SaveSubtitlesFileDialog.h b/src/mpc-hc/SaveSubtitlesFileDialog.h index 0a9255bd3..26de03004 100644 --- a/src/mpc-hc/SaveSubtitlesFileDialog.h +++ b/src/mpc-hc/SaveSubtitlesFileDialog.h @@ -1,5 +1,5 @@ /* - * (C) 2012 see Authors.txt + * (C) 2012-2013 see Authors.txt * * This file is part of MPC-HC. * @@ -40,12 +40,12 @@ protected: public: CSaveSubtitlesFileDialog( CTextFile::enc e, int delay, - LPCTSTR lpszDefExt = NULL, LPCTSTR lpszFileName = NULL, - LPCTSTR lpszFilter = NULL, CWnd* pParentWnd = NULL); + LPCTSTR lpszDefExt = nullptr, LPCTSTR lpszFileName = nullptr, + LPCTSTR lpszFilter = nullptr, CWnd* pParentWnd = nullptr); CSaveSubtitlesFileDialog( int delay, - LPCTSTR lpszDefExt = NULL, LPCTSTR lpszFileName = NULL, - LPCTSTR lpszFilter = NULL, CWnd* pParentWnd = NULL); + LPCTSTR lpszDefExt = nullptr, LPCTSTR lpszFileName = nullptr, + LPCTSTR lpszFilter = nullptr, CWnd* pParentWnd = nullptr); virtual ~CSaveSubtitlesFileDialog(); int GetDelay() { return m_delay; } diff --git a/src/mpc-hc/SaveTextFileDialog.h b/src/mpc-hc/SaveTextFileDialog.h index 79d74139d..a2e68cdb1 100644 --- a/src/mpc-hc/SaveTextFileDialog.h +++ b/src/mpc-hc/SaveTextFileDialog.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.
*
@@ -37,8 +37,8 @@ protected: public:
CSaveTextFileDialog(
CTextFile::enc e,
- LPCTSTR lpszDefExt = NULL, LPCTSTR lpszFileName = NULL,
- LPCTSTR lpszFilter = NULL, CWnd* pParentWnd = NULL);
+ LPCTSTR lpszDefExt = nullptr, LPCTSTR lpszFileName = nullptr,
+ LPCTSTR lpszFilter = nullptr, CWnd* pParentWnd = nullptr);
virtual ~CSaveTextFileDialog();
CTextFile::enc GetEncoding() { return m_e; }
diff --git a/src/mpc-hc/SaveThumbnailsDialog.h b/src/mpc-hc/SaveThumbnailsDialog.h index c77aed440..dfd5b3330 100644 --- a/src/mpc-hc/SaveThumbnailsDialog.h +++ b/src/mpc-hc/SaveThumbnailsDialog.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.
*
@@ -30,8 +30,8 @@ class CSaveThumbnailsDialog : public CFileDialog public:
CSaveThumbnailsDialog(
int rows, int cols, int width,
- LPCTSTR lpszDefExt = NULL, LPCTSTR lpszFileName = NULL,
- LPCTSTR lpszFilter = NULL, CWnd* pParentWnd = NULL);
+ LPCTSTR lpszDefExt = nullptr, LPCTSTR lpszFileName = nullptr,
+ LPCTSTR lpszFilter = nullptr, CWnd* pParentWnd = nullptr);
virtual ~CSaveThumbnailsDialog();
protected:
diff --git a/src/mpc-hc/SelectMediaType.h b/src/mpc-hc/SelectMediaType.h index 4fe174441..62f169e27 100644 --- a/src/mpc-hc/SelectMediaType.h +++ b/src/mpc-hc/SelectMediaType.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.
*
@@ -35,7 +35,7 @@ private: CAtlArray<GUID>& m_guids;
public:
- CSelectMediaType(CAtlArray<GUID>& guids, GUID guid, CWnd* pParent = NULL); // standard constructor
+ CSelectMediaType(CAtlArray<GUID>& guids, GUID guid, CWnd* pParent = nullptr); // standard constructor
virtual ~CSelectMediaType();
GUID m_guid;
diff --git a/src/mpc-hc/ShaderAutoCompleteDlg.h b/src/mpc-hc/ShaderAutoCompleteDlg.h index acddf2ae3..88cee05be 100644 --- a/src/mpc-hc/ShaderAutoCompleteDlg.h +++ b/src/mpc-hc/ShaderAutoCompleteDlg.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.
*
@@ -34,7 +34,7 @@ class CShaderAutoCompleteDlg : public CResizableDialog TCHAR m_text[1024];
public:
- CShaderAutoCompleteDlg(CWnd* pParent = NULL); // standard constructor
+ CShaderAutoCompleteDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CShaderAutoCompleteDlg();
CMap<CString, LPCTSTR, CString, CString> m_inst;
diff --git a/src/mpc-hc/ShaderEditorDlg.h b/src/mpc-hc/ShaderEditorDlg.h index 119759649..b240c2383 100644 --- a/src/mpc-hc/ShaderEditorDlg.h +++ b/src/mpc-hc/ShaderEditorDlg.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.
*
@@ -76,7 +76,7 @@ public: CShaderEditorDlg(); // standard constructor
virtual ~CShaderEditorDlg();
- BOOL Create(CWnd* pParent = NULL);
+ BOOL Create(CWnd* pParent = nullptr);
// Dialog Data
enum { IDD = IDD_SHADEREDITOR_DLG };
diff --git a/src/mpc-hc/StaticLink.h b/src/mpc-hc/StaticLink.h index e8221c385..8ae35e4e3 100644 --- a/src/mpc-hc/StaticLink.h +++ b/src/mpc-hc/StaticLink.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.
*
@@ -26,7 +26,7 @@ class CHyperlink : public CString
{
public:
- CHyperlink(LPCTSTR lpLink = NULL) : CString(lpLink) {}
+ CHyperlink(LPCTSTR lpLink = nullptr) : CString(lpLink) {}
~CHyperlink() {}
const CHyperlink& operator=(LPCTSTR lpsz) {
CString::operator=(lpsz);
@@ -36,7 +36,7 @@ public: return CString::operator LPCTSTR();
}
/*virtual*/ HINSTANCE Navigate() {
- return IsEmpty() ? NULL : ShellExecute(0, _T("open"), *this, 0, 0, SW_SHOWNORMAL);
+ return IsEmpty() ? nullptr : ShellExecute(0, _T("open"), *this, 0, 0, SW_SHOWNORMAL);
}
};
@@ -46,7 +46,7 @@ class CStaticLink : public CStatic {
public:
DECLARE_DYNAMIC(CStaticLink)
- CStaticLink(LPCTSTR lpText = NULL, bool bDeleteOnDestroy = false);
+ CStaticLink(LPCTSTR lpText = nullptr, bool bDeleteOnDestroy = false);
~CStaticLink();
// Hyperlink contains URL/filename. If NULL, I will use the window text.
diff --git a/src/mpc-hc/TunerScanDlg.h b/src/mpc-hc/TunerScanDlg.h index 57a3354ac..c44b7ff66 100644 --- a/src/mpc-hc/TunerScanDlg.h +++ b/src/mpc-hc/TunerScanDlg.h @@ -1,5 +1,5 @@ /*
- * (C) 2009-2012 see Authors.txt
+ * (C) 2009-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -31,7 +31,7 @@ class CTunerScanDlg : public CDialog DECLARE_DYNAMIC(CTunerScanDlg)
public:
- CTunerScanDlg(CWnd* pParent = NULL); // standard constructor
+ CTunerScanDlg(CWnd* pParent = nullptr); // standard constructor
virtual ~CTunerScanDlg();
// Dialog Data
diff --git a/src/mpc-hc/UpdateCheckerDlg.h b/src/mpc-hc/UpdateCheckerDlg.h index 170d6833d..129a5f2a8 100644 --- a/src/mpc-hc/UpdateCheckerDlg.h +++ b/src/mpc-hc/UpdateCheckerDlg.h @@ -1,5 +1,5 @@ /*
- * (C) 2012 see Authors.txt
+ * (C) 2012-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -29,7 +29,7 @@ class UpdateCheckerDlg : public CDialog DECLARE_DYNAMIC(UpdateCheckerDlg)
public:
- UpdateCheckerDlg(Update_Status updateStatus, const Version& latestVersion, CWnd* pParent = NULL);
+ UpdateCheckerDlg(Update_Status updateStatus, const Version& latestVersion, CWnd* pParent = nullptr);
virtual ~UpdateCheckerDlg();
enum { IDD = IDD_UPDATE_DIALOG };
diff --git a/src/mpc-hc/VMROSD.h b/src/mpc-hc/VMROSD.h index 418523866..7b51f53dc 100644 --- a/src/mpc-hc/VMROSD.h +++ b/src/mpc-hc/VMROSD.h @@ -120,7 +120,7 @@ private: void UpdateBitmap();
void UpdateSeekBarPos(CPoint point);
void DrawSlider(CRect* rect, __int64 llMin, __int64 llMax, __int64 llPos);
- void DrawRect(CRect* rect, CBrush* pBrush = NULL, CPen* pPen = NULL);
+ void DrawRect(CRect* rect, CBrush* pBrush = nullptr, CPen* pPen = nullptr);
void Invalidate();
void DrawMessage();
void DrawDebug();
diff --git a/src/mpc-hc/mplayerc.h b/src/mpc-hc/mplayerc.h index 40ae15658..211e16e05 100644 --- a/src/mpc-hc/mplayerc.h +++ b/src/mpc-hc/mplayerc.h @@ -58,7 +58,7 @@ enum { extern HICON LoadIcon(CString fn, bool fSmall);
extern bool LoadType(CString fn, CString& type);
extern bool LoadResource(UINT resid, CStringA& str, LPCTSTR restype);
-extern CStringA GetContentType(CString fn, CAtlList<CString>* redir = NULL);
+extern CStringA GetContentType(CString fn, CAtlList<CString>* redir = nullptr);
extern WORD AssignedToCmd(UINT keyOrMouseValue, bool bIsFullScreen = false, bool bCheckMouse = true);
typedef enum {
@@ -151,7 +151,7 @@ public: void FlushProfile();
virtual BOOL GetProfileBinary(LPCTSTR lpszSection, LPCTSTR lpszEntry, LPBYTE* ppData, UINT* pBytes);
virtual UINT GetProfileInt(LPCTSTR lpszSection, LPCTSTR lpszEntry, int nDefault);
- virtual CString GetProfileString(LPCTSTR lpszSection, LPCTSTR lpszEntry, LPCTSTR lpszDefault = NULL);
+ virtual CString GetProfileString(LPCTSTR lpszSection, LPCTSTR lpszEntry, LPCTSTR lpszDefault = nullptr);
virtual BOOL WriteProfileBinary(LPCTSTR lpszSection, LPCTSTR lpszEntry, LPBYTE pData, UINT nBytes);
virtual BOOL WriteProfileInt(LPCTSTR lpszSection, LPCTSTR lpszEntry, int nValue);
virtual BOOL WriteProfileString(LPCTSTR lpszSection, LPCTSTR lpszEntry, LPCTSTR lpszValue);
|