diff options
63 files changed, 119 insertions, 78 deletions
diff --git a/src/DSUtil/FileVersionInfo.cpp b/src/DSUtil/FileVersionInfo.cpp index 7713f12c2..e9dcab066 100644 --- a/src/DSUtil/FileVersionInfo.cpp +++ b/src/DSUtil/FileVersionInfo.cpp @@ -21,6 +21,14 @@ #include "stdafx.h"
#include "FileVersionInfo.h"
+CFileVersionInfo::CFileVersionInfo()
+{
+}
+
+CFileVersionInfo::~CFileVersionInfo()
+{
+}
+
bool CFileVersionInfo::LoadInfo(LPCTSTR filePath, VS_FIXEDFILEINFO& fileInfo)
{
bool success = false;
diff --git a/src/DSUtil/FileVersionInfo.h b/src/DSUtil/FileVersionInfo.h index a91a5d31f..094892611 100644 --- a/src/DSUtil/FileVersionInfo.h +++ b/src/DSUtil/FileVersionInfo.h @@ -23,7 +23,8 @@ class CFileVersionInfo
{
private:
- CFileVersionInfo() {};
+ CFileVersionInfo();
+ ~CFileVersionInfo();
public:
static bool LoadInfo(LPCTSTR filePath, VS_FIXEDFILEINFO& fileInfo);
diff --git a/src/DSUtil/GolombBuffer.cpp b/src/DSUtil/GolombBuffer.cpp index 845356541..1938b5b16 100644 --- a/src/DSUtil/GolombBuffer.cpp +++ b/src/DSUtil/GolombBuffer.cpp @@ -28,6 +28,10 @@ CGolombBuffer::CGolombBuffer(BYTE* pBuffer, int nSize) Reset();
}
+CGolombBuffer::~CGolombBuffer()
+{
+}
+
UINT64 CGolombBuffer::BitRead(int nBits, bool fPeek)
{
//ASSERT(nBits >= 0 && nBits <= 64);
diff --git a/src/DSUtil/GolombBuffer.h b/src/DSUtil/GolombBuffer.h index 78c3febf7..d4def4805 100644 --- a/src/DSUtil/GolombBuffer.h +++ b/src/DSUtil/GolombBuffer.h @@ -24,6 +24,7 @@ class CGolombBuffer {
public:
CGolombBuffer(BYTE* pBuffer, int nSize);
+ ~CGolombBuffer();
UINT64 BitRead(int nBits, bool fPeek = false);
UINT64 UExpGolombRead();
diff --git a/src/DSUtil/HdmvClipInfo.h b/src/DSUtil/HdmvClipInfo.h index 7a7060940..e5c5d1866 100644 --- a/src/DSUtil/HdmvClipInfo.h +++ b/src/DSUtil/HdmvClipInfo.h @@ -117,7 +117,7 @@ public: REFERENCE_TIME m_rtDuration;
};
- CHdmvClipInfo(void);
+ CHdmvClipInfo();
~CHdmvClipInfo();
HRESULT ReadInfo(LPCTSTR strFile);
diff --git a/src/DSUtil/MediaTypeEx.cpp b/src/DSUtil/MediaTypeEx.cpp index 69ca50191..aff5cb6ea 100644 --- a/src/DSUtil/MediaTypeEx.cpp +++ b/src/DSUtil/MediaTypeEx.cpp @@ -42,6 +42,10 @@ CMediaTypeEx::CMediaTypeEx() {
}
+CMediaTypeEx::~CMediaTypeEx()
+{
+}
+
CString CMediaTypeEx::ToString(IPin* pPin)
{
CString packing, type, codec, dim, rate, dur;
diff --git a/src/DSUtil/MediaTypeEx.h b/src/DSUtil/MediaTypeEx.h index ae3a7a6b6..ffbecbbaa 100644 --- a/src/DSUtil/MediaTypeEx.h +++ b/src/DSUtil/MediaTypeEx.h @@ -25,6 +25,7 @@ class CMediaTypeEx : public CMediaType {
public:
CMediaTypeEx();
+ ~CMediaTypeEx();
CMediaTypeEx(const CMediaType& mt) {
CMediaType::operator = (mt);
}
@@ -37,4 +38,3 @@ public: void Dump(CAtlList<CString>& sl);
};
-
diff --git a/src/DSUtil/NullRenderers.cpp b/src/DSUtil/NullRenderers.cpp index eab325f92..3e192fea2 100644 --- a/src/DSUtil/NullRenderers.cpp +++ b/src/DSUtil/NullRenderers.cpp @@ -96,7 +96,7 @@ public: STDMETHODIMP GetAspectRatioMode(DWORD* pdwAspectRatioMode) { return E_NOTIMPL; };
STDMETHODIMP SetVideoWindow(HWND hwndVideo) { return E_NOTIMPL; };
STDMETHODIMP GetVideoWindow(HWND* phwndVideo);
- STDMETHODIMP RepaintVideo(void) { return E_NOTIMPL; };
+ STDMETHODIMP RepaintVideo() { return E_NOTIMPL; };
STDMETHODIMP GetCurrentImage(BITMAPINFOHEADER* pBih, BYTE** pDib,
DWORD* pcbDib, LONGLONG* pTimeStamp) { return E_NOTIMPL; };
STDMETHODIMP SetBorderColor(COLORREF Clr) { return E_NOTIMPL; };
diff --git a/src/DSUtil/SysVersion.h b/src/DSUtil/SysVersion.h index 769122b03..8abd87f84 100644 --- a/src/DSUtil/SysVersion.h +++ b/src/DSUtil/SysVersion.h @@ -25,6 +25,7 @@ class SysVersion
{
SysVersion() {};
+ ~SysVersion() {};
static OSVERSIONINFOEX InitFullVersion();
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp index cce528026..28a04754b 100644 --- a/src/Subtitles/DVBSub.cpp +++ b/src/Subtitles/DVBSub.cpp @@ -31,7 +31,7 @@ #define BUFFER_CHUNK_GROW 0x1000
-CDVBSub::CDVBSub(void)
+CDVBSub::CDVBSub()
: CBaseSub(ST_DVB)
{
m_nBufferReadPos = 0;
@@ -40,7 +40,7 @@ CDVBSub::CDVBSub(void) m_pBuffer = NULL;
}
-CDVBSub::~CDVBSub(void)
+CDVBSub::~CDVBSub()
{
Reset();
SAFE_DELETE(m_pBuffer);
diff --git a/src/Subtitles/DVBSub.h b/src/Subtitles/DVBSub.h index 93913a816..e1e698840 100644 --- a/src/Subtitles/DVBSub.h +++ b/src/Subtitles/DVBSub.h @@ -30,8 +30,8 @@ class CGolombBuffer; class CDVBSub : public CBaseSub
{
public:
- CDVBSub(void);
- ~CDVBSub(void);
+ CDVBSub();
+ ~CDVBSub();
virtual HRESULT ParseSample(IMediaSample* pSample);
virtual void Render(SubPicDesc& spd, REFERENCE_TIME rt, RECT& bbox);
diff --git a/src/Subtitles/HdmvSub.cpp b/src/Subtitles/HdmvSub.cpp index 0fc8d5176..bcb953f7f 100644 --- a/src/Subtitles/HdmvSub.cpp +++ b/src/Subtitles/HdmvSub.cpp @@ -29,7 +29,7 @@ #endif
-CHdmvSub::CHdmvSub(void)
+CHdmvSub::CHdmvSub()
: CBaseSub(ST_HDMV)
, m_nCurSegment(NO_SEGMENT)
, m_pSegBuffer(NULL)
diff --git a/src/Subtitles/RealTextParser.cpp b/src/Subtitles/RealTextParser.cpp index cfa8910c4..2bbf1468f 100644 --- a/src/Subtitles/RealTextParser.cpp +++ b/src/Subtitles/RealTextParser.cpp @@ -21,7 +21,7 @@ #include "stdafx.h"
#include "RealTextParser.h"
-CRealTextParser::CRealTextParser(void):
+CRealTextParser::CRealTextParser():
m_bIgnoreFont(false),
m_bIgnoreFontSize(false),
m_bIgnoreFontColor(false),
@@ -34,7 +34,7 @@ CRealTextParser::CRealTextParser(void): {
}
-CRealTextParser::~CRealTextParser(void)
+CRealTextParser::~CRealTextParser()
{
}
diff --git a/src/Subtitles/RealTextParser.h b/src/Subtitles/RealTextParser.h index ee5a5d45c..87f1020d2 100644 --- a/src/Subtitles/RealTextParser.h +++ b/src/Subtitles/RealTextParser.h @@ -45,7 +45,7 @@ class CRealTextParser {
public:
CRealTextParser();
- virtual ~CRealTextParser(void);
+ virtual ~CRealTextParser();
struct Tag {
Tag(): m_bOpen(false), m_bClose(false), m_bComment(false), m_bText(false) {}
diff --git a/src/Subtitles/RenderedHdmvSubtitle.cpp b/src/Subtitles/RenderedHdmvSubtitle.cpp index 7be61562f..8f6e3432d 100644 --- a/src/Subtitles/RenderedHdmvSubtitle.cpp +++ b/src/Subtitles/RenderedHdmvSubtitle.cpp @@ -46,7 +46,7 @@ CRenderedHdmvSubtitle::CRenderedHdmvSubtitle(CCritSec* pLock, SUBTITLE_TYPE nTyp m_rtStart = 0;
}
-CRenderedHdmvSubtitle::~CRenderedHdmvSubtitle(void)
+CRenderedHdmvSubtitle::~CRenderedHdmvSubtitle()
{
delete m_pSub;
}
diff --git a/src/Subtitles/RenderedHdmvSubtitle.h b/src/Subtitles/RenderedHdmvSubtitle.h index 1c6b29feb..9575c4dfd 100644 --- a/src/Subtitles/RenderedHdmvSubtitle.h +++ b/src/Subtitles/RenderedHdmvSubtitle.h @@ -31,7 +31,7 @@ class __declspec(uuid("FCA68599-C83E-4ea5-94A3-C2E1B0E326B9")) {
public:
CRenderedHdmvSubtitle(CCritSec* pLock, SUBTITLE_TYPE nType, const CString& name, LCID lcid);
- ~CRenderedHdmvSubtitle(void);
+ ~CRenderedHdmvSubtitle();
DECLARE_IUNKNOWN
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
diff --git a/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.cpp b/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.cpp index 434327bec..a13b8f30b 100644 --- a/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.cpp +++ b/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.cpp @@ -26,7 +26,7 @@ #define ResStr(id) CString(MAKEINTRESOURCE(id)) -CAviSplitterSettingsWnd::CAviSplitterSettingsWnd(void) +CAviSplitterSettingsWnd::CAviSplitterSettingsWnd() { } diff --git a/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.h b/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.h index cb3f0a397..7e205fa1d 100644 --- a/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.h +++ b/src/filters/parser/AviSplitter/AviSplitterSettingsWnd.h @@ -37,7 +37,7 @@ private: }; public: - CAviSplitterSettingsWnd(void); + CAviSplitterSettingsWnd(); bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks); void OnDisconnect(); diff --git a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp index ae3be7f4e..00ea9a376 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp @@ -26,7 +26,7 @@ #define ResStr(id) CString(MAKEINTRESOURCE(id))
-CMpegSplitterSettingsWnd::CMpegSplitterSettingsWnd(void)
+CMpegSplitterSettingsWnd::CMpegSplitterSettingsWnd()
{
}
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h index 25d993f08..5a58164fc 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h +++ b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h @@ -60,7 +60,7 @@ private: };
public:
- CMpegSplitterSettingsWnd(void);
+ CMpegSplitterSettingsWnd();
bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);
void OnDisconnect();
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 968251ef7..f0d4f0c6b 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -635,7 +635,7 @@ HRESULT CMpcAudioRenderer::GetReferenceClockInterface(REFIID riid, void** ppv) return GetReferenceClockInterface(riid, ppv);
}
-HRESULT CMpcAudioRenderer::EndOfStream(void)
+HRESULT CMpcAudioRenderer::EndOfStream()
{
if (m_pDSBuffer) {
m_pDSBuffer->Stop();
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h index 07292b17f..c0330a858 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h @@ -64,7 +64,7 @@ public: virtual HRESULT SetMediaType(const CMediaType* pmt);
virtual HRESULT CompleteConnect(IPin* pReceivePin);
- HRESULT EndOfStream(void);
+ HRESULT EndOfStream();
DECLARE_IUNKNOWN
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp index fa80cab95..06273825e 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp @@ -28,7 +28,7 @@ // ==>>> Resource identifier from "resource.h" present in MPC-HC project!
#define ResStr(id) CString(MAKEINTRESOURCE(id))
-CMpcAudioRendererSettingsWnd::CMpcAudioRendererSettingsWnd(void)
+CMpcAudioRendererSettingsWnd::CMpcAudioRendererSettingsWnd()
{
}
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.h index 8332747dc..54491b922 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.h @@ -44,7 +44,7 @@ private: };
public:
- CMpcAudioRendererSettingsWnd(void);
+ CMpcAudioRendererSettingsWnd();
bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);
void OnDisconnect();
diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon.h b/src/filters/renderer/VideoRenderers/AllocatorCommon.h index 97a6255c8..165812ecb 100644 --- a/src/filters/renderer/VideoRenderers/AllocatorCommon.h +++ b/src/filters/renderer/VideoRenderers/AllocatorCommon.h @@ -70,5 +70,5 @@ MIDL_INTERFACE("A273C7F6-25D4-46b0-B2C8-4F7FADC44E37") IVMRffdshow9 :
public IUnknown {
public:
- virtual STDMETHODIMP support_ffdshow(void) = 0;
+ virtual STDMETHODIMP support_ffdshow() = 0;
};
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 492941833..d70c6b057 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -183,7 +183,7 @@ CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRES m_bLastSampleOffsetValid = false;
}
-CEVRAllocatorPresenter::~CEVRAllocatorPresenter(void)
+CEVRAllocatorPresenter::~CEVRAllocatorPresenter()
{
StopWorkerThreads(); // If not already done...
m_pMediaType = NULL;
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.h index b4c0f5884..0dcbe6cc8 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.h @@ -62,7 +62,7 @@ namespace DSObjects {
public:
CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error);
- ~CEVRAllocatorPresenter(void);
+ ~CEVRAllocatorPresenter();
DECLARE_IUNKNOWN;
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
@@ -130,7 +130,7 @@ namespace DSObjects STDMETHODIMP GetAspectRatioMode(DWORD* pdwAspectRatioMode);
STDMETHODIMP SetVideoWindow(HWND hwndVideo);
STDMETHODIMP GetVideoWindow(HWND* phwndVideo);
- STDMETHODIMP RepaintVideo(void);
+ STDMETHODIMP RepaintVideo();
STDMETHODIMP GetCurrentImage(BITMAPINFOHEADER* pBih, BYTE** pDib, DWORD* pcbDib, LONGLONG* pTimeStamp);
STDMETHODIMP SetBorderColor(COLORREF Clr);
STDMETHODIMP GetBorderColor(COLORREF* pClr);
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index d618b1251..6d835fa10 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -2490,7 +2490,7 @@ CSyncAP::CSyncAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error): CBa m_lShiftToNearest = -1; // Illegal value to start with
}
-CSyncAP::~CSyncAP(void)
+CSyncAP::~CSyncAP()
{
StopWorkerThreads();
m_pMediaType = NULL;
@@ -4026,7 +4026,7 @@ STDMETHODIMP CSyncRenderer::QueryVendorInfo(__out LPWSTR* pVendorInfo) return E_NOTIMPL;
}
-STDMETHODIMP CSyncRenderer::Stop(void)
+STDMETHODIMP CSyncRenderer::Stop()
{
CComPtr<IBaseFilter> pEVRBase;
if (m_pEVR) {
@@ -4038,7 +4038,7 @@ STDMETHODIMP CSyncRenderer::Stop(void) return E_NOTIMPL;
}
-STDMETHODIMP CSyncRenderer::Pause(void)
+STDMETHODIMP CSyncRenderer::Pause()
{
CComPtr<IBaseFilter> pEVRBase;
if (m_pEVR) {
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.h b/src/filters/renderer/VideoRenderers/SyncRenderer.h index 4dc54fef6..d14e4bb24 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.h +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.h @@ -352,7 +352,7 @@ namespace GothSync {
public:
CSyncAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error);
- ~CSyncAP(void);
+ ~CSyncAP();
DECLARE_IUNKNOWN;
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
@@ -414,7 +414,7 @@ namespace GothSync STDMETHODIMP GetAspectRatioMode(DWORD* pdwAspectRatioMode);
STDMETHODIMP SetVideoWindow(HWND hwndVideo);
STDMETHODIMP GetVideoWindow(HWND* phwndVideo);
- STDMETHODIMP RepaintVideo(void);
+ STDMETHODIMP RepaintVideo();
STDMETHODIMP GetCurrentImage(BITMAPINFOHEADER* pBih, BYTE** pDib, DWORD* pcbDib, LONGLONG* pTimeStamp);
STDMETHODIMP SetBorderColor(COLORREF Clr);
STDMETHODIMP GetBorderColor(COLORREF* pClr);
@@ -557,8 +557,8 @@ namespace GothSync virtual HRESULT STDMETHODCALLTYPE QueryFilterInfo(__out FILTER_INFO* pInfo);
virtual HRESULT STDMETHODCALLTYPE JoinFilterGraph(__in_opt IFilterGraph* pGraph, __in_opt LPCWSTR pName);
virtual HRESULT STDMETHODCALLTYPE QueryVendorInfo(__out LPWSTR* pVendorInfo);
- virtual HRESULT STDMETHODCALLTYPE Stop(void);
- virtual HRESULT STDMETHODCALLTYPE Pause(void);
+ virtual HRESULT STDMETHODCALLTYPE Stop();
+ virtual HRESULT STDMETHODCALLTYPE Pause();
virtual HRESULT STDMETHODCALLTYPE Run(REFERENCE_TIME tStart);
virtual HRESULT STDMETHODCALLTYPE GetState(DWORD dwMilliSecsTimeout, __out FILTER_STATE* State);
virtual HRESULT STDMETHODCALLTYPE SetSyncSource(__in_opt IReferenceClock* pClock);
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp index 45c67ce6e..544825277 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp @@ -31,8 +31,8 @@ using namespace DSObjects; interface __declspec(uuid("D6EE8031-214E-4E9E-A3A7-458925F933AB"))
IMadVRExclusiveModeInfo :
public IUnknown {
- STDMETHOD_(BOOL, IsExclusiveModeActive)(void) = 0;
- STDMETHOD_(BOOL, IsMadVRSeekbarEnabled)(void) = 0;
+ STDMETHOD_(BOOL, IsExclusiveModeActive)() = 0;
+ STDMETHOD_(BOOL, IsMadVRSeekbarEnabled)() = 0;
};
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h index 3307b2f9a..c866c11a0 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h @@ -28,7 +28,7 @@ interface __declspec(uuid("ABA34FDA-DD22-4E00-9AB4-4ABF927D0B0C")) IMadVRTextOsd :
public IUnknown {
STDMETHOD(OsdDisplayMessage)(LPCWSTR text, DWORD milliseconds) = 0;
- STDMETHOD(OsdClearMessage)(void) = 0;
+ STDMETHOD(OsdClearMessage)() = 0;
};
namespace DSObjects
diff --git a/src/filters/transform/MPCVideoDec/CpuId.cpp b/src/filters/transform/MPCVideoDec/CpuId.cpp index 456a902e2..98d9bbc41 100644 --- a/src/filters/transform/MPCVideoDec/CpuId.cpp +++ b/src/filters/transform/MPCVideoDec/CpuId.cpp @@ -35,7 +35,7 @@ #define CPUID_MMXEXT (1 << 22)
-CCpuId::CCpuId(void)
+CCpuId::CCpuId()
{
unsigned nHighestFeature;
unsigned nHighestFeatureEx;
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp index 9c76cfec5..2b015c074 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp @@ -42,7 +42,7 @@ CDXVADecoderMpeg2::CDXVADecoderMpeg2(CMPCVideoDecFilter* pFilter, IDirectXVideoD Init();
}
-CDXVADecoderMpeg2::~CDXVADecoderMpeg2(void)
+CDXVADecoderMpeg2::~CDXVADecoderMpeg2()
{
Flush();
}
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.h b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.h index b4bf9ab71..311461cfe 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.h +++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.h @@ -30,7 +30,7 @@ class CDXVADecoderMpeg2 : public CDXVADecoder public:
CDXVADecoderMpeg2(CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber);
CDXVADecoderMpeg2(CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, DXVAMode nMode, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config);
- virtual ~CDXVADecoderMpeg2(void);
+ virtual ~CDXVADecoderMpeg2();
virtual HRESULT DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop);
virtual void CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nSize);
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp index 53967b097..e5363aba9 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp @@ -50,7 +50,7 @@ CDXVADecoderVC1::CDXVADecoderVC1(CMPCVideoDecFilter* pFilter, IDirectXVideoDecod Init();
}
-CDXVADecoderVC1::~CDXVADecoderVC1(void)
+CDXVADecoderVC1::~CDXVADecoderVC1()
{
Flush();
}
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.h b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.h index a31432348..0d0416664 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.h +++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.h @@ -28,7 +28,7 @@ class CDXVADecoderVC1 : public CDXVADecoder public:
CDXVADecoderVC1(CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber);
CDXVADecoderVC1(CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, DXVAMode nMode, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config);
- virtual ~CDXVADecoderVC1(void);
+ virtual ~CDXVADecoderVC1();
// === Public functions
virtual HRESULT DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop);
diff --git a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h index fca404b21..c3a9dbaab 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h +++ b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h @@ -76,8 +76,8 @@ public: virtual ~CVideoDecDXVAAllocator();
protected:
- HRESULT Alloc(void);
- void Free(void);
+ HRESULT Alloc();
+ void Free();
private:
CMPCVideoDecFilter* m_pVideoDecFilter;
diff --git a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp index 2279e7909..f05ecb1f6 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp +++ b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp @@ -34,7 +34,7 @@ CVideoDecOutputPin::CVideoDecOutputPin(TCHAR* pObjectName, CBaseVideoFilter* pFi memset(&m_ddUncompPixelFormat, 0, sizeof(m_ddUncompPixelFormat));
}
-CVideoDecOutputPin::~CVideoDecOutputPin(void)
+CVideoDecOutputPin::~CVideoDecOutputPin()
{
}
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 673cdc0e6..8b14fbdab 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -89,7 +89,7 @@ STDAPI DllUnregisterServer() //
-BOOL (__stdcall* Real_IsDebuggerPresent)(void)
+BOOL (__stdcall* Real_IsDebuggerPresent)()
= IsDebuggerPresent;
LONG(__stdcall* Real_ChangeDisplaySettingsExA)(LPCSTR a0,
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp index ea9e2f6ed..03dd0ac2c 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp @@ -753,7 +753,6 @@ void CDVSTimingPPage::UpdateControlData(bool fSave) CDVSAboutPPage::CDVSAboutPPage(LPUNKNOWN lpunk, HRESULT* phr) :
CDVSBasePPage(NAME("About Property Page"), lpunk, IDD_DVSABOUTPAGE, IDD_DVSABOUTPAGE)
{
-
}
bool CDVSAboutPPage::OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
diff --git a/src/mpc-hc/DVBChannel.cpp b/src/mpc-hc/DVBChannel.cpp index 07a14c8fe..dc5b612d3 100644 --- a/src/mpc-hc/DVBChannel.cpp +++ b/src/mpc-hc/DVBChannel.cpp @@ -23,7 +23,7 @@ #include "DVBChannel.h"
-CDVBChannel::CDVBChannel(void)
+CDVBChannel::CDVBChannel()
: m_ulFrequency(0)
, m_nPrefNumber(0)
, m_nOriginNumber(0)
@@ -42,7 +42,7 @@ CDVBChannel::CDVBChannel(void) {
}
-CDVBChannel::~CDVBChannel(void)
+CDVBChannel::~CDVBChannel()
{
}
diff --git a/src/mpc-hc/DVBChannel.h b/src/mpc-hc/DVBChannel.h index 5bd6057b7..7be8d9648 100644 --- a/src/mpc-hc/DVBChannel.h +++ b/src/mpc-hc/DVBChannel.h @@ -54,8 +54,8 @@ typedef struct { class CDVBChannel
{
public:
- CDVBChannel(void);
- ~CDVBChannel(void);
+ CDVBChannel();
+ ~CDVBChannel();
void FromString(CString strValue);
CString ToString();
diff --git a/src/mpc-hc/EditListEditor.cpp b/src/mpc-hc/EditListEditor.cpp index 96fec5d69..c9f0c8851 100644 --- a/src/mpc-hc/EditListEditor.cpp +++ b/src/mpc-hc/EditListEditor.cpp @@ -30,6 +30,10 @@ CClip::CClip() {
}
+CClip::~CClip()
+{
+}
+
void CClip::SetIn(LPCTSTR strVal)
{
m_rtIn = StringToReftime(strVal);
@@ -75,7 +79,7 @@ CString CClip::GetOut() }
IMPLEMENT_DYNAMIC(CEditListEditor, CPlayerBar)
-CEditListEditor::CEditListEditor(void)
+CEditListEditor::CEditListEditor()
: m_pDragImage(NULL)
, m_CurPos(NULL)
, m_bDragging(FALSE)
@@ -85,7 +89,7 @@ CEditListEditor::CEditListEditor(void) {
}
-CEditListEditor::~CEditListEditor(void)
+CEditListEditor::~CEditListEditor()
{
SaveEditListToFile();
}
diff --git a/src/mpc-hc/EditListEditor.h b/src/mpc-hc/EditListEditor.h index 63a548585..1bb7fd799 100644 --- a/src/mpc-hc/EditListEditor.h +++ b/src/mpc-hc/EditListEditor.h @@ -33,6 +33,7 @@ private: public:
CClip();
+ ~CClip();
bool HaveIn() { return m_rtIn != _I64_MIN; };
bool HaveOut() { return m_rtOut != _I64_MIN; };
@@ -91,8 +92,8 @@ protected: DECLARE_MESSAGE_MAP()
public:
- CEditListEditor(void);
- ~CEditListEditor(void);
+ CEditListEditor();
+ ~CEditListEditor();
BOOL Create(CWnd* pParentWnd, UINT defDockBarID);
diff --git a/src/mpc-hc/FGFilter.cpp b/src/mpc-hc/FGFilter.cpp index c8c49f82d..2decbf798 100644 --- a/src/mpc-hc/FGFilter.cpp +++ b/src/mpc-hc/FGFilter.cpp @@ -41,6 +41,10 @@ CFGFilter::CFGFilter(const CLSID& clsid, CStringW name, UINT64 merit) m_merit.val = merit;
}
+CFGFilter::~CFGFilter()
+{
+}
+
const CAtlList<GUID>& CFGFilter::GetTypes() const
{
return m_types;
diff --git a/src/mpc-hc/FGFilter.h b/src/mpc-hc/FGFilter.h index be9ece89f..9821ecc30 100644 --- a/src/mpc-hc/FGFilter.h +++ b/src/mpc-hc/FGFilter.h @@ -47,7 +47,7 @@ protected: public:
CFGFilter(const CLSID& clsid, CStringW name = L"", UINT64 merit = MERIT64_DO_USE);
- virtual ~CFGFilter() {}
+ virtual ~CFGFilter();
CLSID GetCLSID() const { return m_clsid; }
CStringW GetName() const { return m_name; }
diff --git a/src/mpc-hc/Ifo.cpp b/src/mpc-hc/Ifo.cpp index cc4a34e74..74c2db013 100644 --- a/src/mpc-hc/Ifo.cpp +++ b/src/mpc-hc/Ifo.cpp @@ -93,7 +93,7 @@ CIfo::CIfo() {
}
-CIfo::~CIfo(void)
+CIfo::~CIfo()
{
delete [] m_pBuffer;
}
diff --git a/src/mpc-hc/Ifo.h b/src/mpc-hc/Ifo.h index d54d25d6c..be1c359dc 100644 --- a/src/mpc-hc/Ifo.h +++ b/src/mpc-hc/Ifo.h @@ -33,7 +33,7 @@ class CIfo {
public:
CIfo();
- ~CIfo(void);
+ ~CIfo();
bool OpenFile(LPCTSTR strFile);
bool SaveFile(LPCTSTR strFile);
diff --git a/src/mpc-hc/KeyProvider.cpp b/src/mpc-hc/KeyProvider.cpp index dc23717c5..e8c3ca093 100644 --- a/src/mpc-hc/KeyProvider.cpp +++ b/src/mpc-hc/KeyProvider.cpp @@ -29,6 +29,10 @@ CKeyProvider::CKeyProvider() {
}
+CKeyProvider::~CKeyProvider()
+{
+}
+
STDMETHODIMP CKeyProvider::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
return
diff --git a/src/mpc-hc/KeyProvider.h b/src/mpc-hc/KeyProvider.h index 6c039d5d7..38fd82c43 100644 --- a/src/mpc-hc/KeyProvider.h +++ b/src/mpc-hc/KeyProvider.h @@ -32,6 +32,7 @@ class CKeyProvider {
public:
CKeyProvider();
+ ~CKeyProvider();
DECLARE_IUNKNOWN;
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
diff --git a/src/mpc-hc/LcdSupport.cpp b/src/mpc-hc/LcdSupport.cpp index 50da356aa..efd5e6f66 100644 --- a/src/mpc-hc/LcdSupport.cpp +++ b/src/mpc-hc/LcdSupport.cpp @@ -174,12 +174,12 @@ void CLCDMyProgressBar::SetProgressStyle(eMY_PROGRESS_STYLE eMyStyle) /******************************************************************************************************
****************************************** CLCDMyMonoPage ****************************************/
-CLCDMyMonoPage::CLCDMyMonoPage(void)
+CLCDMyMonoPage::CLCDMyMonoPage()
{
Initialize();
}
-CLCDMyMonoPage::~CLCDMyMonoPage(void)
+CLCDMyMonoPage::~CLCDMyMonoPage()
{
DeleteObject(hBmp[PS_PLAY]);
DeleteObject(hBmp[PS_PAUSE]);
@@ -188,7 +188,6 @@ CLCDMyMonoPage::~CLCDMyMonoPage(void) HRESULT CLCDMyMonoPage::Initialize()
{
-
LOGFONT lf;
HFONT hFont;
unsigned int x, y;
@@ -367,12 +366,12 @@ void CLCDMyMonoPage::SetPlayState(PlayState ps) /******************************************************************************************************
****************************************** CLCDMyColorPage ****************************************/
-CLCDMyColorPage::CLCDMyColorPage(void)
+CLCDMyColorPage::CLCDMyColorPage()
{
Initialize();
}
-CLCDMyColorPage::~CLCDMyColorPage(void)
+CLCDMyColorPage::~CLCDMyColorPage()
{
DeleteObject(hBmp[PS_PLAY]);
DeleteObject(hBmp[PS_PAUSE]);
@@ -564,7 +563,7 @@ void CLCDMyColorPage::SetPlayState(PlayState ps) ********************************************** CMPC_Lcd *********************************************/
/* attach to an available lcd */
-CMPC_Lcd::CMPC_Lcd(void)
+CMPC_Lcd::CMPC_Lcd()
{
InitializeCriticalSection(&cs);
hLCD_UpdateThread = NULL;
@@ -610,7 +609,7 @@ CMPC_Lcd::CMPC_Lcd(void) }
/* detach from lcd */
-CMPC_Lcd::~CMPC_Lcd(void)
+CMPC_Lcd::~CMPC_Lcd()
{
if (m_Connection.IsConnected()) {
Thread_Loop = false;
diff --git a/src/mpc-hc/LcdSupport.h b/src/mpc-hc/LcdSupport.h index 8b9bef11f..1a73fbf76 100644 --- a/src/mpc-hc/LcdSupport.h +++ b/src/mpc-hc/LcdSupport.h @@ -53,7 +53,7 @@ public: PS_UNUSED = 3
};
- virtual HRESULT Initialize(void);
+ virtual HRESULT Initialize();
virtual void OnLCDButtonUp(int nButton);
void SetPlayState(PlayState ps);
@@ -78,7 +78,7 @@ public: PS_UNUSED = 3
};
- virtual HRESULT Initialize(void);
+ virtual HRESULT Initialize();
virtual void OnLCDButtonUp(int nButton);
void SetPlayState(PlayState ps);
diff --git a/src/mpc-hc/MiniDump.cpp b/src/mpc-hc/MiniDump.cpp index 154264841..e8d6347d4 100644 --- a/src/mpc-hc/MiniDump.cpp +++ b/src/mpc-hc/MiniDump.cpp @@ -51,6 +51,10 @@ CMiniDump::CMiniDump() #endif
}
+CMiniDump::~CMiniDump()
+{
+}
+
LPTOP_LEVEL_EXCEPTION_FILTER WINAPI MyDummySetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter)
{
return NULL;
diff --git a/src/mpc-hc/MiniDump.h b/src/mpc-hc/MiniDump.h index 329e38023..cc383b83f 100644 --- a/src/mpc-hc/MiniDump.h +++ b/src/mpc-hc/MiniDump.h @@ -27,6 +27,8 @@ class CMiniDump {
public:
CMiniDump();
+ ~CMiniDump();
+
static void Enable() { m_bMiniDumpEnabled = true; };
static void Disable() { m_bMiniDumpEnabled = false; };
diff --git a/src/mpc-hc/PlayerBar.cpp b/src/mpc-hc/PlayerBar.cpp index 854a3adb5..2f2c73b4a 100644 --- a/src/mpc-hc/PlayerBar.cpp +++ b/src/mpc-hc/PlayerBar.cpp @@ -24,11 +24,11 @@ IMPLEMENT_DYNAMIC(CPlayerBar, CSizingControlBarG)
-CPlayerBar::CPlayerBar(void)
+CPlayerBar::CPlayerBar()
{
}
-CPlayerBar::~CPlayerBar(void)
+CPlayerBar::~CPlayerBar()
{
}
diff --git a/src/mpc-hc/PlayerBar.h b/src/mpc-hc/PlayerBar.h index 7b82ca4f2..bef6a2b18 100644 --- a/src/mpc-hc/PlayerBar.h +++ b/src/mpc-hc/PlayerBar.h @@ -34,8 +34,8 @@ protected: CString m_strSettingName;
public:
- CPlayerBar(void);
- virtual ~CPlayerBar(void);
+ CPlayerBar();
+ virtual ~CPlayerBar();
BOOL Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, UINT nID, UINT defDockBarID, CString const& strSettingName);
diff --git a/src/mpc-hc/StaticLink.cpp b/src/mpc-hc/StaticLink.cpp index fcf651d42..ec1d2aeb3 100644 --- a/src/mpc-hc/StaticLink.cpp +++ b/src/mpc-hc/StaticLink.cpp @@ -49,6 +49,10 @@ CStaticLink::CStaticLink(LPCTSTR lpText, bool bDeleteOnDestroy) {
}
+CStaticLink::~CStaticLink()
+{
+}
+
//////////////////
// Normally, a static control does not get mouse events unless it has
// SS_NOTIFY. This achieves the same effect as SS_NOTIFY, but it's fewer
diff --git a/src/mpc-hc/StaticLink.h b/src/mpc-hc/StaticLink.h index ba934e12a..e8221c385 100644 --- a/src/mpc-hc/StaticLink.h +++ b/src/mpc-hc/StaticLink.h @@ -47,7 +47,7 @@ class CStaticLink : public CStatic public:
DECLARE_DYNAMIC(CStaticLink)
CStaticLink(LPCTSTR lpText = NULL, bool bDeleteOnDestroy = false);
- ~CStaticLink() {}
+ ~CStaticLink();
// Hyperlink contains URL/filename. If NULL, I will use the window text.
// (GetWindowText) to get the target.
diff --git a/src/mpc-hc/UpdateChecker.cpp b/src/mpc-hc/UpdateChecker.cpp index e4aff6114..0cf032762 100644 --- a/src/mpc-hc/UpdateChecker.cpp +++ b/src/mpc-hc/UpdateChecker.cpp @@ -37,7 +37,7 @@ UpdateChecker::UpdateChecker(CString versionFileURL) {
}
-UpdateChecker::~UpdateChecker(void)
+UpdateChecker::~UpdateChecker()
{
}
diff --git a/src/mpc-hc/UpdateChecker.h b/src/mpc-hc/UpdateChecker.h index 096c919c4..277d615f0 100644 --- a/src/mpc-hc/UpdateChecker.h +++ b/src/mpc-hc/UpdateChecker.h @@ -50,7 +50,7 @@ public: static const LPCTSTR MPC_HC_UPDATE_URL;
UpdateChecker(CString versionFileURL);
- ~UpdateChecker(void);
+ ~UpdateChecker();
Update_Status IsUpdateAvailable(const Version& currentVersion);
Update_Status IsUpdateAvailable();
diff --git a/src/mpc-hc/VMROSD.cpp b/src/mpc-hc/VMROSD.cpp index 3a2f04ca5..e2919ab43 100644 --- a/src/mpc-hc/VMROSD.cpp +++ b/src/mpc-hc/VMROSD.cpp @@ -28,7 +28,7 @@ #define SLIDER_CURSOR_WIDTH 15
-CVMROSD::CVMROSD(void)
+CVMROSD::CVMROSD()
: m_pWnd(NULL)
, m_llSeekMin(0)
, m_llSeekMax(0)
@@ -62,7 +62,7 @@ CVMROSD::CVMROSD(void) memset(&m_BitmapInfo, 0, sizeof(m_BitmapInfo));
}
-CVMROSD::~CVMROSD(void)
+CVMROSD::~CVMROSD()
{
m_MemDC.DeleteDC();
}
diff --git a/src/mpc-hc/VMROSD.h b/src/mpc-hc/VMROSD.h index 132f57b9f..85a278025 100644 --- a/src/mpc-hc/VMROSD.h +++ b/src/mpc-hc/VMROSD.h @@ -49,8 +49,8 @@ typedef enum { class CVMROSD
{
public:
- CVMROSD(void);
- ~CVMROSD(void);
+ CVMROSD();
+ ~CVMROSD();
void Start(CWnd* pWnd, IVMRMixerBitmap9* pVMB, bool bShowSeekBar);
void Start(CWnd* pWnd, IMFVideoMixerBitmap* pVMB, bool bShowSeekBar);
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index c3c724e76..fa539a82b 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -532,7 +532,7 @@ bool CMPlayerCApp::SendCommandLine(HWND hWnd) /////////////////////////////////////////////////////////////////////////////
// CMPlayerCApp initialization
-BOOL (__stdcall* Real_IsDebuggerPresent)(void)
+BOOL (__stdcall* Real_IsDebuggerPresent)()
= IsDebuggerPresent;
LONG(__stdcall* Real_ChangeDisplaySettingsExA)(LPCSTR a0,
|