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

6 files changed, 17 insertions, 17 deletions

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);

 }