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:
authorUnderground78 <underground78@users.sourceforge.net>2012-06-02 15:53:15 +0400
committerUnderground78 <underground78@users.sourceforge.net>2012-06-02 15:53:15 +0400
commitddcfe82895fa59ec07692a972931a0e0ae4196b7 (patch)
treeb551f3b98c6951c387f7eb02b5903e3ca3062859 /src/filters
parent095b3d0e65730e1d31733a403fff4787cb674429 (diff)
Cosmetics: make the return statements consistent.
Patch partially by XhmikosR. git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4978 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters')
-rw-r--r--src/filters/muxer/MatroskaMuxer/MatroskaFile.h12
-rw-r--r--src/filters/parser/AviSplitter/AviFile.cpp6
-rw-r--r--src/filters/parser/BaseSplitter/BaseSplitter.cpp2
-rw-r--r--src/filters/parser/MatroskaSplitter/MatroskaFile.cpp14
-rw-r--r--src/filters/parser/MatroskaSplitter/MatroskaFile.h8
-rw-r--r--src/filters/parser/OggSplitter/OggSplitter.cpp2
-rw-r--r--src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp2
-rw-r--r--src/filters/reader/VTSReader/VTSReader.cpp4
-rw-r--r--src/filters/source/D2VSource/MPEG2Dec.cpp4
-rw-r--r--src/filters/source/FLICSource/FLICSource.cpp2
-rw-r--r--src/filters/source/ShoutcastSource/ShoutcastSource.cpp8
-rw-r--r--src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp10
-rw-r--r--src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp2
-rw-r--r--src/filters/transform/BufferFilter/BufferFilter.cpp8
-rw-r--r--src/filters/transform/DeCSSFilter/DeCSSFilter.cpp2
-rw-r--r--src/filters/transform/VSFilter/DirectVobSubFilter.cpp14
-rw-r--r--src/filters/transform/VSFilter/Systray.cpp2
-rw-r--r--src/filters/transform/VSFilter/plugins.cpp30
18 files changed, 66 insertions, 66 deletions
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
index d86d7a715..1da6ad4b4 100644
--- a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
+++ b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h
@@ -64,7 +64,7 @@ namespace MatroskaWriter
CBinary(DWORD id) : CID(id) {}
CBinary& operator = (const CBinary& b) {
Copy(b);
- return(*this);
+ return *this;
}
operator BYTE*() {
return (BYTE*)GetData();
@@ -72,9 +72,9 @@ namespace MatroskaWriter
CBinary& Set(CStringA str) {
SetCount(str.GetLength()+1);
strcpy_s((char*)GetData(), str.GetLength() + 1, str);
- return(*this);
+ return *this;
}
- // CBinary& Set(CStringA str) {SetCount(str.GetLength()); memcpy((char*)GetData(), str, str.GetLength()); return(*this);}
+ // CBinary& Set(CStringA str) {SetCount(str.GetLength()); memcpy((char*)GetData(), str, str.GetLength()); return *this;}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
};
@@ -85,7 +85,7 @@ namespace MatroskaWriter
CANSI(DWORD id) : CID(id) {}
CANSI& Set(CStringA str) {
CStringA::operator = (str);
- return(*this);
+ return *this;
}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
@@ -97,7 +97,7 @@ namespace MatroskaWriter
CUTF8(DWORD id) : CID(id) {}
CUTF8& Set(CStringW str) {
CStringW::operator = (str);
- return(*this);
+ return *this;
}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
@@ -119,7 +119,7 @@ namespace MatroskaWriter
BASE& Set(T val) {
m_val = val;
m_fSet = true;
- return(*(BASE*)this);
+ return (*(BASE*)this);
}
void UnSet() {
m_fSet = false;
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp
index 3685d1be2..418be117e 100644
--- a/src/filters/parser/AviSplitter/AviFile.cpp
+++ b/src/filters/parser/AviSplitter/AviFile.cpp
@@ -332,7 +332,7 @@ REFERENCE_TIME CAviFile::GetTotalTime()
t = 10i64*m_avih.dwMicroSecPerFrame*m_avih.dwTotalFrames;
}
- return(t);
+ return t;
}
HRESULT CAviFile::BuildIndex()
@@ -571,7 +571,7 @@ bool CAviFile::IsInterleaved(bool fKeepInfo)
}
}
- return(fInterleaved);
+ return fInterleaved;
}
REFERENCE_TIME CAviFile::strm_t::GetRefTime(DWORD frame, UINT64 size)
@@ -630,7 +630,7 @@ DWORD CAviFile::strm_t::GetKeyFrame(REFERENCE_TIME rt)
break;
}
}
- return(i);
+ return i;
}
DWORD CAviFile::strm_t::GetChunkSize(DWORD size)
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
index 9796727c3..c6bf35946 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
@@ -343,7 +343,7 @@ HRESULT CBaseSplitterOutputPin::DeliverBeginFlush()
if (S_OK != hr) {
m_eEndFlush.Set();
}
- return(hr);
+ return hr;
}
HRESULT CBaseSplitterOutputPin::DeliverEndFlush()
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
index 5c439e209..9055df19e 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
@@ -286,7 +286,7 @@ UINT64 Segment::GetMasterTrack()
ChapterAtom* ChapterAtom::FindChapterAtom(UINT64 id)
{
if (ChapterUID == id) {
- return(this);
+ return this;
}
POSITION pos = ChapterAtoms.GetHeadPosition();
@@ -297,7 +297,7 @@ ChapterAtom* ChapterAtom::FindChapterAtom(UINT64 id)
}
}
- return(NULL);
+ return NULL;
}
ChapterAtom* Segment::FindChapterAtom(UINT64 id, int nEditionEntry)
@@ -316,7 +316,7 @@ ChapterAtom* Segment::FindChapterAtom(UINT64 id, int nEditionEntry)
}
}
- return(NULL);
+ return NULL;
}
HRESULT Info::Parse(CMatroskaNode* pMN0)
@@ -1106,7 +1106,7 @@ HRESULT CANSI::Parse(CMatroskaNode* pMN)
*this += c;
}
- return(len == -1 ? S_OK : E_FAIL);
+ return (len == -1 ? S_OK : E_FAIL);
}
HRESULT CUTF8::Parse(CMatroskaNode* pMN)
@@ -1445,7 +1445,7 @@ bool CMatroskaNode::Find(DWORD id, bool fSearch)
}
}
- return(m_id == id);
+ return (m_id == id);
}
void CMatroskaNode::SeekTo(MatroskaReader::QWORD pos)
@@ -1502,7 +1502,7 @@ CAutoPtr<CMatroskaNode> CMatroskaNode::Copy()
pNewNode->m_len.Set(m_len);
pNewNode->m_filepos = m_filepos;
pNewNode->m_start = m_start;
- return(pNewNode);
+ return pNewNode;
}
CAutoPtr<CMatroskaNode> CMatroskaNode::GetFirstBlock()
@@ -1565,7 +1565,7 @@ bool CMatroskaNode::Resync()
case 0x1043A770: // Chapters
case 0x1254C367: // Tags
SeekTo(GetPos()-4);
- return(SUCCEEDED(Parse()));
+ return SUCCEEDED(Parse());
default:
SeekTo(GetPos()-3);
break;
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.h b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
index 2252a00d6..b9335d7c6 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.h
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.h
@@ -55,12 +55,12 @@ namespace MatroskaReader
BASE& operator = (const BASE& v) {
m_val = v.m_val;
m_fValid = true;
- return(*this);
+ return *this;
}
BASE& operator = (T val) {
m_val = val;
m_fValid = true;
- return(*this);
+ return *this;
}
operator T() const {
return m_val;
@@ -68,7 +68,7 @@ namespace MatroskaReader
BASE& Set(T val) {
m_val = val;
m_fValid = true;
- return(*(BASE*)this);
+ return (*(BASE*)this);
}
bool IsValid() const {
return m_fValid;
@@ -117,7 +117,7 @@ namespace MatroskaReader
public:
CBinary& operator = (const CBinary& b) {
Copy(b);
- return(*this);
+ return *this;
}
CStringA ToString() {
return CStringA((LPCSTR)GetData(), GetCount());
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp
index d56e555ef..fc161b4fb 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.cpp
+++ b/src/filters/parser/OggSplitter/OggSplitter.cpp
@@ -97,7 +97,7 @@ public:
}
bool hasbits(int cnt) {
int pos = m_pos+cnt;
- return(pos >= 0 && pos < m_len);
+ return (pos >= 0 && pos < m_len);
}
unsigned int showbits(int cnt) { // a bit unclean, but works and can read backwards too! :P
if (!hasbits(cnt)) {
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
index 201717431..9668d7999 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
@@ -2553,7 +2553,7 @@ HRESULT CRealAudioDecoder::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR
return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/reader/VTSReader/VTSReader.cpp b/src/filters/reader/VTSReader/VTSReader.cpp
index 45d7490b1..e6573878c 100644
--- a/src/filters/reader/VTSReader/VTSReader.cpp
+++ b/src/filters/reader/VTSReader/VTSReader.cpp
@@ -210,7 +210,7 @@ CVTSStream::~CVTSStream()
bool CVTSStream::Load(const WCHAR* fnw)
{
CAtlList<CString> sl;
- return(m_vob && m_vob->Open(CString(fnw), sl) /*&& m_vob->IsDVD()*/);
+ return (m_vob && m_vob->Open(CString(fnw), sl) /*&& m_vob->IsDVD()*/);
}
HRESULT CVTSStream::SetPointer(LONGLONG llPos)
@@ -261,7 +261,7 @@ LONGLONG CVTSStream::Size(LONGLONG* pSizeAvailable)
if (pSizeAvailable) {
*pSizeAvailable = len;
}
- return(len);
+ return len;
}
DWORD CVTSStream::Alignment()
diff --git a/src/filters/source/D2VSource/MPEG2Dec.cpp b/src/filters/source/D2VSource/MPEG2Dec.cpp
index 980eda9b4..3c4094357 100644
--- a/src/filters/source/D2VSource/MPEG2Dec.cpp
+++ b/src/filters/source/D2VSource/MPEG2Dec.cpp
@@ -1115,7 +1115,7 @@ int CMPEG2Dec::extra_bit_information()
Byte_Count ++;
}
- return(Byte_Count);
+ return Byte_Count;
}
/* Copyright extension */
@@ -3762,7 +3762,7 @@ static char* myfgets(char* buff, int len, FILE* file)
ret = fgets(buff, len, file);
}
- return(ret);
+ return ret;
}
int CMPEG2Dec::Open(LPCTSTR path, DstFormat dstFormat)
diff --git a/src/filters/source/FLICSource/FLICSource.cpp b/src/filters/source/FLICSource/FLICSource.cpp
index a5635f822..733294321 100644
--- a/src/filters/source/FLICSource/FLICSource.cpp
+++ b/src/filters/source/FLICSource/FLICSource.cpp
@@ -652,7 +652,7 @@ bool CFLICStream::_colorchunk(bool f64)
}
}
- return(nColorsUpdated == 256);
+ return (nColorsUpdated == 256);
}
void CFLICStream::_brunchunk()
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
index f2be74206..6e60c9236 100644
--- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
+++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
@@ -74,7 +74,7 @@ typedef struct {
channels = s_channels[(buff[3]>>6)&3];
framesize = freq ? ((((version&1)?144:72) * bitrate / freq) + ((buff[2]>>1)&1)) : 0;
- return(sync == 0xfff && layer == 3 && bitrate != 0 && freq != 0);
+ return (sync == 0xfff && layer == 3 && bitrate != 0 && freq != 0);
}
} mp3hdr;
@@ -318,13 +318,13 @@ LONGLONG CShoutcastStream::GetBufferFullness()
return 0;
}
LONGLONG ret = 100i64*(m_queue.GetTail().rtStart - m_queue.GetHead().rtStart) / AVGBUFFERLENGTH;
- return(min(ret, 100));
+ return min(ret, 100);
}
CString CShoutcastStream::GetTitle()
{
CAutoLock cAutoLock(&m_queue);
- return(m_title);
+ return m_title;
}
HRESULT CShoutcastStream::DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties)
@@ -698,7 +698,7 @@ bool CShoutcastStream::CShoutcastSocket::Connect(CUrl& url)
m_metaint = metaint;
m_nBytesRead = 0;
- return(FindSync());
+ return FindSync();
}
bool CShoutcastStream::CShoutcastSocket::FindSync()
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp
index 5bfcc754d..f720b6b3b 100644
--- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp
+++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp
@@ -439,7 +439,7 @@ STDMETHODIMP CStreamSwitcherInputPin::DynamicDisconnect()
STDMETHODIMP_(bool) CStreamSwitcherInputPin::IsActive()
{
// TODO: lock onto something here
- return(this == (static_cast<CStreamSwitcherFilter*>(m_pFilter))->GetInputPin());
+ return (this == (static_cast<CStreamSwitcherFilter*>(m_pFilter))->GetInputPin());
}
//
@@ -1033,7 +1033,7 @@ HRESULT CStreamSwitcherOutputPin::DecideBufferSize(IMemAllocator* pAllocator, AL
return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
@@ -1221,7 +1221,7 @@ int CStreamSwitcherFilter::GetPinCount()
{
CAutoLock cAutoLock(&m_csPins);
- return(1 + (int)m_pInputs.GetCount());
+ return (1 + (int)m_pInputs.GetCount());
}
CBasePin* CStreamSwitcherFilter::GetPin(int n)
@@ -1250,7 +1250,7 @@ int CStreamSwitcherFilter::GetConnectedInputPinCount()
}
}
- return(nConnected);
+ return nConnected;
}
CStreamSwitcherInputPin* CStreamSwitcherFilter::GetConnectedInputPin(int n)
@@ -1261,7 +1261,7 @@ CStreamSwitcherInputPin* CStreamSwitcherFilter::GetConnectedInputPin(int n)
CStreamSwitcherInputPin* pPin = m_pInputs.GetNext(pos);
if (pPin->IsConnected()) {
if (n == 0) {
- return(pPin);
+ return pPin;
}
n--;
}
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp
index 0c1309ade..c09432751 100644
--- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp
+++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp
@@ -402,7 +402,7 @@ HRESULT CAVI2AC3Filter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PR
return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp
index ec2526e5b..70602083d 100644
--- a/src/filters/transform/BufferFilter/BufferFilter.cpp
+++ b/src/filters/transform/BufferFilter/BufferFilter.cpp
@@ -130,19 +130,19 @@ STDMETHODIMP CBufferFilter::SetBuffers(int nBuffers)
STDMETHODIMP_(int) CBufferFilter::GetBuffers()
{
- return(m_nSamplesToBuffer);
+ return m_nSamplesToBuffer;
}
STDMETHODIMP_(int) CBufferFilter::GetFreeBuffers()
{
CBufferFilterOutputPin* pPin = static_cast<CBufferFilterOutputPin*>(m_pOutput);
- return(pPin && pPin->m_pOutputQueue ? (m_nSamplesToBuffer - pPin->m_pOutputQueue->GetQueueCount()) : 0);
+ return (pPin && pPin->m_pOutputQueue ? (m_nSamplesToBuffer - pPin->m_pOutputQueue->GetQueueCount()) : 0);
}
STDMETHODIMP CBufferFilter::SetPriority(DWORD dwPriority)
{
CBufferFilterOutputPin* pPin = static_cast<CBufferFilterOutputPin*>(m_pOutput);
- return(pPin && pPin->m_pOutputQueue ? (pPin->m_pOutputQueue->SetPriority(dwPriority) ? S_OK : E_FAIL) : E_UNEXPECTED);
+ return (pPin && pPin->m_pOutputQueue ? (pPin->m_pOutputQueue->SetPriority(dwPriority) ? S_OK : E_FAIL) : E_UNEXPECTED);
}
//
@@ -269,7 +269,7 @@ HRESULT CBufferFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PRO
return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp b/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp
index 2431a61e5..f8d02d3a1 100644
--- a/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp
+++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp
@@ -222,7 +222,7 @@ HRESULT CDeCSSFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROP
return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
index 90476e616..7a7dfa48f 100644
--- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
+++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
@@ -632,7 +632,7 @@ bool CDirectVobSubFilter::AdjustFrameSize(CSize& s)
s.cy = (s.cy + 1) & ~1;
}
- return(fRet);
+ return fRet;
}
STDMETHODIMP CDirectVobSubFilter::Count(DWORD* pcStreams)
@@ -683,7 +683,7 @@ int CDirectVobSubFilter::FindPreferedLanguage(bool fHideToo)
CoTaskMemFree(pName);
if (!l.CompareNoCase(lang)) {
- return(ret);
+ return ret;
}
}
}
@@ -1145,13 +1145,13 @@ STDMETHODIMP CDirectVobSubFilter::HasConfigDialog(int iSelected)
}
return E_FAIL;
// TODO: temporally disabled since we don't have a new textsub/vobsub editor dlg for dvs yet
- // return(nLangs >= 0 && iSelected < nLangs ? S_OK : E_FAIL);
+ // return (nLangs >= 0 && iSelected < nLangs ? S_OK : E_FAIL);
}
STDMETHODIMP CDirectVobSubFilter::ShowConfigDialog(int iSelected, HWND hWndParent)
{
// TODO: temporally disabled since we don't have a new textsub/vobsub editor dlg for dvs yet
- return(E_FAIL);
+ return E_FAIL;
}
///////////////////////////////////////////////////////////////////////////
@@ -1176,7 +1176,7 @@ HRESULT CDirectVobSubFilter2::CheckConnect(PIN_DIRECTION dir, IPin* pPin)
CFilterInfo fi;
if (SUCCEEDED(pi.pFilter->QueryFilterInfo(&fi))
&& !_wcsnicmp(fi.achName, L"Overlay Mixer", 13)) {
- return(E_FAIL);
+ return E_FAIL;
}
} else {
}
@@ -1392,7 +1392,7 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph)
}
}
- return(fRet);
+ return fRet;
}
void CDirectVobSubFilter2::GetRidOfInternalScriptRenderer()
@@ -1484,7 +1484,7 @@ bool CDirectVobSubFilter::Open()
m_frd.RefreshEvent.Set();
- return(m_pSubStreams.GetCount() > 0);
+ return (m_pSubStreams.GetCount() > 0);
}
void CDirectVobSubFilter::UpdateSubtitle(bool fApplyDefStyle)
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp
index a4ff114b8..8678c00f0 100644
--- a/src/filters/transform/VSFilter/Systray.cpp
+++ b/src/filters/transform/VSFilter/Systray.cpp
@@ -392,5 +392,5 @@ static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd)
free(wstr);
}
- return(ret);
+ return ret;
}
diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp
index 85440c8b6..7a9dbecea 100644
--- a/src/filters/transform/VSFilter/plugins.cpp
+++ b/src/filters/transform/VSFilter/plugins.cpp
@@ -206,7 +206,7 @@ namespace Plugin
}
int GetCharSet() {
- return(m_CharSet);
+ return m_CharSet;
}
bool Open(CString fn, int CharSet = DEFAULT_CHARSET) {
@@ -806,7 +806,7 @@ namespace Plugin
Render(dst, (REFERENCE_TIME)(10000000i64 * n / fps), fps);
- return(frame);
+ return frame;
}
};
@@ -824,7 +824,7 @@ namespace Plugin
AVSValue __cdecl VobSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
+ return (DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
}
class CTextSubAvisynthFilter : public CTextSubFilter, public CAvisynthFilter
@@ -840,17 +840,17 @@ namespace Plugin
AVSValue __cdecl TextSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString()));
}
AVSValue __cdecl TextSubCreateSI(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt()));
}
AVSValue __cdecl TextSubCreateSIF(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt(), (float)args[3].AsFloat()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt(), (float)args[3].AsFloat()));
}
AVSValue __cdecl MaskSubCreateSIIFI(AVSValue args, void* user_data, IScriptEnvironment* env)
@@ -873,7 +873,7 @@ namespace Plugin
};
AVSValue clip(env->Invoke("Blackness",value,nom));
env->SetVar(env->SaveString("RGBA"),true);
- return(DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
+ return (DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
}
extern "C" __declspec(dllexport) const char* __stdcall AvisynthPluginInit(IScriptEnvironment* env)
@@ -884,7 +884,7 @@ namespace Plugin
env->AddFunction("TextSub", "csif", TextSubCreateSIF, 0);
env->AddFunction("MaskSub", "siifi", MaskSubCreateSIIFI, 0);
env->SetVar(env->SaveString("RGBA"),false);
- return(NULL);
+ return NULL;
}
}
@@ -935,7 +935,7 @@ namespace Plugin
Render(dst, timestamp, fps);
- return(frame);
+ return frame;
}
};
@@ -953,7 +953,7 @@ namespace Plugin
AVSValue __cdecl VobSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
+ return (DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
}
class CTextSubAvisynthFilter : public CTextSubFilter, public CAvisynthFilter
@@ -976,7 +976,7 @@ namespace Plugin
vfr = GetVFRTranslator(args[4].AsString());
}
- return(DNew CTextSubAvisynthFilter(
+ return (DNew CTextSubAvisynthFilter(
args[0].AsClip(),
env,
args[1].AsString(),
@@ -988,7 +988,7 @@ namespace Plugin
AVSValue __cdecl TextSubSwapUV(AVSValue args, void* user_data, IScriptEnvironment* env)
{
s_fSwapUV = args[0].AsBool(false);
- return(AVSValue());
+ return AVSValue();
}
AVSValue __cdecl MaskSubCreate(AVSValue args, void* user_data, IScriptEnvironment* env)/*SIIFI*/
@@ -1021,8 +1021,8 @@ namespace Plugin
};
AVSValue clip(env->Invoke("Blackness",value,nom));
env->SetVar(env->SaveString("RGBA"),true);
- //return(DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
- return(DNew CTextSubAvisynthFilter(
+ //return (DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
+ return (DNew CTextSubAvisynthFilter(
clip.AsClip(),
env,
args[0].AsString(),
@@ -1038,7 +1038,7 @@ namespace Plugin
env->AddFunction("TextSubSwapUV", "b", TextSubSwapUV, 0);
env->AddFunction("MaskSub", "[file]s[width]i[height]i[fps]f[length]i[charset]i[vfr]s", MaskSubCreate, 0);
env->SetVar(env->SaveString("RGBA"),false);
- return(NULL);
+ return NULL;
}
}