Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/DSUtil/GolombBuffer.h6
-rw-r--r--src/DSUtil/H264Nalu.h10
-rw-r--r--src/DSUtil/HdmvClipInfo.h4
-rw-r--r--src/apps/mplayerc/ConvertDlg.h2
-rw-r--r--src/apps/mplayerc/DVBChannel.h32
-rw-r--r--src/apps/mplayerc/EVRAllocatorPresenter.cpp2
-rw-r--r--src/apps/mplayerc/EditListEditor.h2
-rw-r--r--src/apps/mplayerc/FGFilter.h8
-rw-r--r--src/apps/mplayerc/FGManagerBDA.h8
-rw-r--r--src/apps/mplayerc/MediaFormats.h8
-rw-r--r--src/apps/mplayerc/mplayerc.h2
-rw-r--r--src/decss/VobFile.h4
-rw-r--r--src/filters/muxer/MatroskaMuxer/MatroskaFile.h2
-rw-r--r--src/filters/parser/BaseSplitter/BaseSplitterFile.h4
-rw-r--r--src/filters/parser/MatroskaSplitter/MatroskaFile.h6
-rw-r--r--src/filters/reader/asyncreader/asyncio.h12
-rw-r--r--src/filters/transform/MPCVideoDec/CpuId.h4
-rw-r--r--src/filters/transform/MPCVideoDec/DXVADecoder.h4
-rw-r--r--src/subtitles/libssf/Exception.h2
-rw-r--r--src/subtitles/libssf/FontWrapper.h2
-rw-r--r--src/ui/TreePropSheet/PropPageFrameDefault.cpp10
21 files changed, 67 insertions, 67 deletions
diff --git a/src/DSUtil/GolombBuffer.h b/src/DSUtil/GolombBuffer.h
index c3079465c..3a14f040e 100644
--- a/src/DSUtil/GolombBuffer.h
+++ b/src/DSUtil/GolombBuffer.h
@@ -43,9 +43,9 @@ public:
void Reset(BYTE* pNewBuffer, int nNewSize);
void SetSize(int nValue) { m_nSize = nValue; };
- int GetSize() { return m_nSize; };
- int RemainingSize() { return m_nSize - m_nBitPos; };
- bool IsEOF() { return m_nBitPos >= m_nSize; };
+ int GetSize() const { return m_nSize; };
+ int RemainingSize() const { return m_nSize - m_nBitPos; };
+ bool IsEOF() const const { return m_nBitPos >= m_nSize; };
INT64 GetPos();
BYTE* GetBufferPos() { return m_pBuffer + m_nBitPos; };
diff --git a/src/DSUtil/H264Nalu.h b/src/DSUtil/H264Nalu.h
index 6678e385a..d097a5730 100644
--- a/src/DSUtil/H264Nalu.h
+++ b/src/DSUtil/H264Nalu.h
@@ -60,10 +60,10 @@ private :
bool MoveToNextStartcode();
public :
- NALU_TYPE GetType() { return nal_unit_type; };
- bool IsRefFrame() { return (nal_reference_idc != 0); };
+ NALU_TYPE GetType() const { return nal_unit_type; };
+ bool IsRefFrame() const { return (nal_reference_idc != 0); };
- int GetDataLength() { return m_nCurPos - m_nNALDataPos; };
+ int GetDataLength() const { return m_nCurPos - m_nNALDataPos; };
BYTE* GetDataBuffer() { return m_pBuffer + m_nNALDataPos; };
int GetRoundedDataLength()
{
@@ -71,9 +71,9 @@ public :
return nSize + 128 - (nSize %128);
}
- int GetLength() { return m_nCurPos - m_nNALStartPos; };
+ int GetLength() const { return m_nCurPos - m_nNALStartPos; };
BYTE* GetNALBuffer() { return m_pBuffer + m_nNALStartPos; };
- bool IsEOF() { return m_nCurPos >= m_nSize; };
+ bool IsEOF() const { return m_nCurPos >= m_nSize; };
void SetBuffer (BYTE* pBuffer, int nSize, int nNALSize);
bool ReadNext();
diff --git a/src/DSUtil/HdmvClipInfo.h b/src/DSUtil/HdmvClipInfo.h
index 8a53d81b4..0f129035b 100644
--- a/src/DSUtil/HdmvClipInfo.h
+++ b/src/DSUtil/HdmvClipInfo.h
@@ -117,7 +117,7 @@ public:
REFERENCE_TIME m_rtIn;
REFERENCE_TIME m_rtOut;
- REFERENCE_TIME Duration()
+ REFERENCE_TIME Duration() const
{
return m_rtOut - m_rtIn;
}
@@ -133,7 +133,7 @@ public:
HRESULT ReadInfo(LPCTSTR strFile);
Stream* FindStream(SHORT wPID);
- bool IsHdmv() { return m_bIsHdmv; };
+ bool IsHdmv() const { return m_bIsHdmv; };
int GetStreamNumber() { return int(m_Streams.GetCount()); };
Stream* GetStreamByIndex(int nIndex){ return (unsigned(nIndex) < m_Streams.GetCount()) ? &m_Streams[nIndex] : NULL; };
diff --git a/src/apps/mplayerc/ConvertDlg.h b/src/apps/mplayerc/ConvertDlg.h
index 7965cded0..0be898a34 100644
--- a/src/apps/mplayerc/ConvertDlg.h
+++ b/src/apps/mplayerc/ConvertDlg.h
@@ -59,7 +59,7 @@ public:
virtual bool ToolTip(CString& str) {return false;}
void SetLabel(LPCTSTR label);
void SetImage(int nImage, int nSelectedImage);
- operator HTREEITEM() {return m_hTI;}
+ operator HTREEITEM() const {return m_hTI;}
};
class CTreeItemFilter : public CTreeItem
diff --git a/src/apps/mplayerc/DVBChannel.h b/src/apps/mplayerc/DVBChannel.h
index ec84d2676..256d3964f 100644
--- a/src/apps/mplayerc/DVBChannel.h
+++ b/src/apps/mplayerc/DVBChannel.h
@@ -62,22 +62,22 @@ public:
void FromString(CString strValue);
CString ToString();
- LPCTSTR GetName() { return m_strName; };
- ULONG GetFrequency() { return m_ulFrequency; };
- int GetPrefNumber() { return m_nPrefNumber; };
- int GetOriginNumber() { return m_nOriginNumber; };
- ULONG GetONID() { return m_ulONID; };
- ULONG GetTSID() { return m_ulTSID; };
- ULONG GetSID() { return m_ulSID; };
- ULONG GetPMT() { return m_ulPMT; };
- ULONG GetPCR() { return m_ulPCR; };
- ULONG GetVideoPID() { return m_ulVideoPID; };
- DVB_STREAM_TYPE GetVideoType() { return m_nVideoType; }
- ULONG GetDefaultAudioPID() { return m_Audios[0].PID; /* TODO : fa*/ };
- DVB_STREAM_TYPE GetDefaultAudioType() { return m_Audios[0].Type; }
- ULONG GetDefaultSubtitlePID() { return m_Subtitles[0].PID; /* TODO : fa*/ };
- int GetAudioCount() { return m_nAudioCount; };
- int GetSubtitleCount() { return m_nSubtitleCount; };
+ LPCTSTR GetName() const { return m_strName; };
+ ULONG GetFrequency() const { return m_ulFrequency; };
+ int GetPrefNumber() const { return m_nPrefNumber; };
+ int GetOriginNumber() const { return m_nOriginNumber; };
+ ULONG GetONID() const { return m_ulONID; };
+ ULONG GetTSID() const { return m_ulTSID; };
+ ULONG GetSID() const { return m_ulSID; };
+ ULONG GetPMT() const { return m_ulPMT; };
+ ULONG GetPCR() const { return m_ulPCR; };
+ ULONG GetVideoPID() const { return m_ulVideoPID; };
+ DVB_STREAM_TYPE GetVideoType() const { return m_nVideoType; }
+ ULONG GetDefaultAudioPID() const { return m_Audios[0].PID; /* TODO : fa*/ };
+ DVB_STREAM_TYPE GetDefaultAudioType() const { return m_Audios[0].Type; }
+ ULONG GetDefaultSubtitlePID() const { return m_Subtitles[0].PID; /* TODO : fa*/ };
+ int GetAudioCount() const { return m_nAudioCount; };
+ int GetSubtitleCount() const { return m_nSubtitleCount; };
DVBStreamInfo* GetAudio(int nIndex) { return &m_Audios[nIndex]; };
DVBStreamInfo* GetSubtitle(int nIndex) { return &m_Subtitles[nIndex]; };
bool HasName() { return !m_strName.IsEmpty(); };
diff --git a/src/apps/mplayerc/EVRAllocatorPresenter.cpp b/src/apps/mplayerc/EVRAllocatorPresenter.cpp
index 10c6340ad..e5e5fca4b 100644
--- a/src/apps/mplayerc/EVRAllocatorPresenter.cpp
+++ b/src/apps/mplayerc/EVRAllocatorPresenter.cpp
@@ -2565,7 +2565,7 @@ void CEVRAllocatorPresenter::MoveToScheduledList(IMFSample* pSample, bool _bSort
m_Int = _Other;
}
- operator int ()
+ operator int () const
{
return m_Int;
}
diff --git a/src/apps/mplayerc/EditListEditor.h b/src/apps/mplayerc/EditListEditor.h
index 665165647..644718020 100644
--- a/src/apps/mplayerc/EditListEditor.h
+++ b/src/apps/mplayerc/EditListEditor.h
@@ -46,7 +46,7 @@ public :
CString GetIn();
CString GetOut();
- CString GetName() { return m_strName; };
+ CString GetName() const { return m_strName; };
};
class CEditListEditor : public CSizingControlBarG
diff --git a/src/apps/mplayerc/FGFilter.h b/src/apps/mplayerc/FGFilter.h
index 5beaf97e4..b58b511af 100644
--- a/src/apps/mplayerc/FGFilter.h
+++ b/src/apps/mplayerc/FGFilter.h
@@ -44,10 +44,10 @@ public:
CFGFilter(const CLSID& clsid, CStringW name = L"", UINT64 merit = MERIT64_DO_USE);
virtual ~CFGFilter() {}
- CLSID GetCLSID() {return m_clsid;}
- CStringW GetName() {return m_name;}
- UINT64 GetMerit() {return m_merit.val;}
- DWORD GetMeritForDirectShow() {return m_merit.mid;}
+ CLSID GetCLSID() const {return m_clsid;}
+ CStringW GetName() const {return m_name;}
+ UINT64 GetMerit() const {return m_merit.val;}
+ DWORD GetMeritForDirectShow() const {return m_merit.mid;}
const CAtlList<GUID>& GetTypes() const;
void SetTypes(const CAtlList<GUID>& types);
void AddType(const GUID& majortype, const GUID& subtype);
diff --git a/src/apps/mplayerc/FGManagerBDA.h b/src/apps/mplayerc/FGManagerBDA.h
index 6e3c6da18..167141eac 100644
--- a/src/apps/mplayerc/FGManagerBDA.h
+++ b/src/apps/mplayerc/FGManagerBDA.h
@@ -46,9 +46,9 @@ public :
m_ulMappedPID(0)
{}
- LPWSTR GetName() { return m_Name; };
- const AM_MEDIA_TYPE* GetMediaType() { return m_pmt; };
- bool GetFindExisting() { return m_bFindExisting; };
+ LPWSTR GetName() /*const*/ { return m_Name; };
+ const AM_MEDIA_TYPE* GetMediaType() /*const*/ { return m_pmt; };
+ bool GetFindExisting() const { return m_bFindExisting; };
IBaseFilter* GetFilter() { return m_pFilter; };
void SetPin(IPin* pPin)
@@ -80,7 +80,7 @@ public :
return m_pMap->UnmapPID (1, &ulPID);
}
- ULONG GetMappedPID()
+ ULONG GetMappedPID() const
{
return m_ulMappedPID;
}
diff --git a/src/apps/mplayerc/MediaFormats.h b/src/apps/mplayerc/MediaFormats.h
index 5726f03a0..d79b1db8d 100644
--- a/src/apps/mplayerc/MediaFormats.h
+++ b/src/apps/mplayerc/MediaFormats.h
@@ -56,14 +56,14 @@ public:
bool FindExt(CString ext) {return m_exts.Find(ext.TrimLeft(_T(".")).MakeLower()) != NULL;}
- CString GetLabel() {return m_label;}
+ CString GetLabel() const {return m_label;}
CString GetFilter();
CString GetExts(bool fAppendEngine = false);
CString GetExtsWithPeriod(bool fAppendEngine = false);
CString GetBackupExtsWithPeriod(bool fAppendEngine = false);
- CString GetSpecReqNote() {return m_specreqnote;}
- bool IsAudioOnly() {return m_fAudioOnly;}
- engine_t GetEngineType() {return m_engine;}
+ CString GetSpecReqNote() const {return m_specreqnote;}
+ bool IsAudioOnly() const {return m_fAudioOnly;}
+ engine_t GetEngineType() const {return m_engine;}
void SetEngineType(engine_t e) {m_engine = e;}
};
diff --git a/src/apps/mplayerc/mplayerc.h b/src/apps/mplayerc/mplayerc.h
index ad1193316..9615cc81a 100644
--- a/src/apps/mplayerc/mplayerc.h
+++ b/src/apps/mplayerc/mplayerc.h
@@ -508,7 +508,7 @@ public:
DVD_HMSF_TIMECODE DVDPosition;
CSize fixedWindowSize;
- bool HasFixedWindowSize() {return fixedWindowSize.cx > 0 || fixedWindowSize.cy > 0;}
+ bool HasFixedWindowSize() const {return fixedWindowSize.cx > 0 || fixedWindowSize.cy > 0;}
// int iFixedWidth, iFixedHeight;
int iMonitor;
diff --git a/src/decss/VobFile.h b/src/decss/VobFile.h
index 97b4c7a25..c5f083851 100644
--- a/src/decss/VobFile.h
+++ b/src/decss/VobFile.h
@@ -30,8 +30,8 @@ public:
bool Open(LPCTSTR path);
void Close();
- operator HANDLE() {return m_hDrive;}
- operator DVD_SESSION_ID() {return m_session;}
+ operator HANDLE() const {return m_hDrive;}
+ operator DVD_SESSION_ID() const {return m_session;}
bool SendKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData);
bool ReadKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData, int lba = 0);
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
index 664f44a6d..80273dd76 100644
--- a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
+++ b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
@@ -37,7 +37,7 @@ namespace MatroskaWriter
public:
CID(DWORD id);
- DWORD GetID() {return m_id;}
+ DWORD GetID() const {return m_id;}
virtual QWORD Size(bool fWithHeader = true);
virtual HRESULT Write(IStream* pStream);
};
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFile.h b/src/filters/parser/BaseSplitter/BaseSplitterFile.h
index 0567d41c5..e7498223e 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFile.h
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFile.h
@@ -61,8 +61,8 @@ public:
void BitByteAlign(), BitFlush();
HRESULT ByteRead(BYTE* pData, __int64 len);
- bool IsStreaming() {return m_fStreaming;}
- bool IsRandomAccess() {return m_fRandomAccess;}
+ bool IsStreaming() const {return m_fStreaming;}
+ bool IsRandomAccess() const {return m_fRandomAccess;}
HRESULT HasMoreData(__int64 len = 1, DWORD ms = 1);
};
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.h b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
index 4d6d7562b..d1106ee24 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.h
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
@@ -44,9 +44,9 @@ namespace MatroskaReader
CSimpleVar(T val = 0) : m_val(val), m_fValid(false) {}
BASE& operator = (const BASE& v) {m_val = v.m_val; m_fValid = true; return(*this);}
BASE& operator = (T val) {m_val = val; m_fValid = true; return(*this);}
- operator T() {return m_val;}
+ operator T() const {return m_val;}
BASE& Set(T val) {m_val = val; m_fValid = true; return(*(BASE*)this);}
- bool IsValid() {return m_fValid;}
+ bool IsValid() const {return m_fValid;}
virtual HRESULT Parse(CMatroskaNode* pMN);
};
@@ -413,7 +413,7 @@ namespace MatroskaReader
UINT64 GetMasterTrack();
- REFERENCE_TIME GetRefTime(INT64 t) {return t*(REFERENCE_TIME)(SegmentInfo.TimeCodeScale)/100;}
+ REFERENCE_TIME GetRefTime(INT64 t) const {return t*(REFERENCE_TIME)(SegmentInfo.TimeCodeScale)/100;}
ChapterAtom* FindChapterAtom(UINT64 id, int nEditionEntry = 0);
};
diff --git a/src/filters/reader/asyncreader/asyncio.h b/src/filters/reader/asyncreader/asyncio.h
index af52d48c3..0f463bf7a 100644
--- a/src/filters/reader/asyncreader/asyncio.h
+++ b/src/filters/reader/asyncreader/asyncio.h
@@ -71,32 +71,32 @@ public:
HRESULT Complete();
// cancels the i/o. blocks until i/o is no longer pending
- HRESULT Cancel()
+ HRESULT Cancel() const
{
return S_OK;
};
// accessor functions
- LPVOID GetContext()
+ LPVOID GetContext() /*const*/
{
return m_pContext;
};
- DWORD GetUser()
+ DWORD GetUser() const
{
return m_dwUser;
};
- HRESULT GetHResult() {
+ HRESULT GetHResult() const {
return m_hr;
};
// we set m_lLength to the actual length
- LONG GetActualLength() {
+ LONG GetActualLength() const {
return m_lLength;
};
- LONGLONG GetStart() {
+ LONGLONG GetStart() const {
return m_llPos;
};
};
diff --git a/src/filters/transform/MPCVideoDec/CpuId.h b/src/filters/transform/MPCVideoDec/CpuId.h
index b196f8358..524ff9e4b 100644
--- a/src/filters/transform/MPCVideoDec/CpuId.h
+++ b/src/filters/transform/MPCVideoDec/CpuId.h
@@ -48,8 +48,8 @@ public:
CCpuId();
- int GetFeatures() { return m_nCPUFeatures; };
- PROCESSOR_TYPE GetType() { return m_nType; };
+ int GetFeatures() const { return m_nCPUFeatures; };
+ PROCESSOR_TYPE GetType() const { return m_nType; };
int GetProcessorNumber();
private :
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.h b/src/filters/transform/MPCVideoDec/DXVADecoder.h
index 9f47502d7..19d874ab3 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.h
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.h
@@ -82,8 +82,8 @@ class CDXVADecoder
public :
// === Public functions
virtual ~CDXVADecoder();
- DXVAMode GetMode() { return m_nMode; };
- DXVA_ENGINE GetEngine() { return m_nEngine; };
+ DXVAMode GetMode() const { return m_nMode; };
+ DXVA_ENGINE GetEngine() const { return m_nEngine; };
void AllocExecuteParams (int nSize);
void SetDirectXVideoDec (IDirectXVideoDecoder* pDirectXVideoDec) { m_pDirectXVideoDec = pDirectXVideoDec; };
diff --git a/src/subtitles/libssf/Exception.h b/src/subtitles/libssf/Exception.h
index 0141e9f06..c45a06919 100644
--- a/src/subtitles/libssf/Exception.h
+++ b/src/subtitles/libssf/Exception.h
@@ -30,6 +30,6 @@ namespace ssf
public:
Exception(LPCTSTR fmt, ...);
- CString ToString() {return m_msg;}
+ CString ToString() const {return m_msg;}
};
} \ No newline at end of file
diff --git a/src/subtitles/libssf/FontWrapper.h b/src/subtitles/libssf/FontWrapper.h
index e19121862..86c7a601b 100644
--- a/src/subtitles/libssf/FontWrapper.h
+++ b/src/subtitles/libssf/FontWrapper.h
@@ -35,7 +35,7 @@ namespace ssf
virtual ~FontWrapper();
operator HFONT() const {return m_hFont;}
operator LPCWSTR() const {return m_key;}
- const TEXTMETRIC& GetTextMetric() {return m_tm;}
+ const TEXTMETRIC& GetTextMetric() const {return m_tm;}
int GetKernAmount(WCHAR c1, WCHAR c2);
};
} \ No newline at end of file
diff --git a/src/ui/TreePropSheet/PropPageFrameDefault.cpp b/src/ui/TreePropSheet/PropPageFrameDefault.cpp
index 85e69940a..a0da46b5d 100644
--- a/src/ui/TreePropSheet/PropPageFrameDefault.cpp
+++ b/src/ui/TreePropSheet/PropPageFrameDefault.cpp
@@ -78,19 +78,19 @@ public:
// call wrappers
public:
- BOOL IsThemeActive()
+ BOOL IsThemeActive() const
{THEMECALL(IsThemeActive)();}
- HTHEME OpenThemeData(HWND hwnd, LPCWSTR pszClassList)
+ HTHEME OpenThemeData(HWND hwnd, LPCWSTR pszClassList) const
{THEMECALL(OpenThemeData)(hwnd, pszClassList);}
- HRESULT CloseThemeData(HTHEME hTheme)
+ HRESULT CloseThemeData(HTHEME hTheme) const
{THEMECALL(CloseThemeData)(hTheme);}
- HRESULT GetThemeBackgroundContentRect(HTHEME hTheme, OPTIONAL HDC hdc, int iPartId, int iStateId, const RECT *pBoundingRect, OUT RECT *pContentRect)
+ HRESULT GetThemeBackgroundContentRect(HTHEME hTheme, OPTIONAL HDC hdc, int iPartId, int iStateId, const RECT *pBoundingRect, OUT RECT *pContentRect) const
{THEMECALL(GetThemeBackgroundContentRect)(hTheme, hdc, iPartId, iStateId, pBoundingRect, pContentRect);}
- HRESULT DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, OPTIONAL const RECT *pClipRect)
+ HRESULT DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, OPTIONAL const RECT *pClipRect) const
{THEMECALL(DrawThemeBackground)(hTheme, hdc, iPartId, iStateId, pRect, pClipRect);}
// function pointers
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 22:15:46 +0300