Changed C casts to C++ casts and some code formatting corrections

Patch by XhmikosR

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1676 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 13 insertions, 13 deletions

diff --git a/src/filters/source/FlacSource/FlacSource.cpp b/src/filters/source/FlacSource/FlacSource.cpp
index e3f1df264..1745a5fe0 100644
--- a/src/filters/source/FlacSource/FlacSource.cpp
+++ b/src/filters/source/FlacSource/FlacSource.cpp
@@ -279,7 +279,7 @@ void CFlacStream::UpdateFromMetadata (void* pBuffer)
 

 FLAC__StreamDecoderReadStatus StreamDecoderRead(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 	UINT			nRead;

 

 	 nRead				= pThis->GetFile()->Read (buffer, *bytes);

@@ -291,7 +291,7 @@ FLAC__StreamDecoderReadStatus StreamDecoderRead(const FLAC__StreamDecoder *decod
 

 FLAC__StreamDecoderSeekStatus	StreamDecoderSeek(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 	

 	pThis->m_bIsEOF	= false;

 	pThis->GetFile()->Seek (absolute_byte_offset, CFile::begin);

@@ -300,28 +300,28 @@ FLAC__StreamDecoderSeekStatus	StreamDecoderSeek(const FLAC__StreamDecoder *decod
 

 FLAC__StreamDecoderTellStatus	StreamDecoderTell(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 	*absolute_byte_offset = pThis->GetFile()->GetPosition();

 	return FLAC__STREAM_DECODER_TELL_STATUS_OK;

 }

 

 FLAC__StreamDecoderLengthStatus	StreamDecoderLength(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 	CFile*			pFile = pThis->GetFile();

 

 	if (pFile == NULL)

 		return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;

 	else

 	{

-		*stream_length = pFile->GetLength();
+		*stream_length = pFile->GetLength();

 		return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;

-	}
+	}

 }

 

 FLAC__bool StreamDecoderEof(const FLAC__StreamDecoder *decoder, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 

 	return pThis->m_bIsEOF;

 }

@@ -329,7 +329,7 @@ FLAC__bool StreamDecoderEof(const FLAC__StreamDecoder *decoder, void *client_dat
 

 FLAC__StreamDecoderWriteStatus StreamDecoderWrite(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 

 

 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;

@@ -342,7 +342,7 @@ void StreamDecoderError(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderE
 

 void StreamDecoderMetadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)

 {

-	CFlacStream*	pThis = (CFlacStream*) client_data;

+	CFlacStream*	pThis = static_cast<CFlacStream*> (client_data);

 

 	if (pThis)

 		pThis->UpdateFromMetadata ((void*)metadata);

diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
index 729aecde7..56978f710 100644
--- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
+++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp
@@ -211,7 +211,7 @@ STDMETHODIMP CShoutcastSource::QueryProgress(LONGLONG* pllTotal, LONGLONG* pllCu
 	if(m_iPins == 1)

 	{

         if(pllTotal) *pllTotal = 100;

-		if(pllCurrent) *pllCurrent = ((CShoutcastStream*)m_paStreams[0])->GetBufferFullness();

+		if(pllCurrent) *pllCurrent = (static_cast<CShoutcastStream*>(m_paStreams[0]))->GetBufferFullness();

 		return S_OK;

 	}

 

@@ -231,7 +231,7 @@ STDMETHODIMP CShoutcastSource::get_Title(BSTR* pbstrTitle)
 

 	if(m_iPins == 1)

 	{

-		*pbstrTitle = ((CShoutcastStream*)m_paStreams[0])->GetTitle().AllocSysString();

+		*pbstrTitle = (static_cast<CShoutcastStream*>(m_paStreams[0]))->GetTitle().AllocSysString();

 		return S_OK;

 	}

 

@@ -431,7 +431,7 @@ HRESULT CShoutcastStream::CheckMediaType(const CMediaType* pmt)
 

 static UINT SocketThreadProc(LPVOID pParam)

 {

-	return ((CShoutcastStream*)pParam)->SocketThreadProc();

+	return (static_cast<CShoutcastStream*>(pParam))->SocketThreadProc();

 }

 

 UINT CShoutcastStream::SocketThreadProc()

diff --git a/src/filters/source/SubtitleSource/SubtitleSource.cpp b/src/filters/source/SubtitleSource/SubtitleSource.cpp
index 23533da1a..1ac0471d5 100644
--- a/src/filters/source/SubtitleSource/SubtitleSource.cpp
+++ b/src/filters/source/SubtitleSource/SubtitleSource.cpp
@@ -536,7 +536,7 @@ HRESULT CSubtitleStream::FillBuffer(IMediaSample* pSample)
 

 HRESULT CSubtitleStream::GetMediaType(CMediaType* pmt)

 {

-	return ((CSubtitleSource*)m_pFilter)->GetMediaType(pmt);

+	return (static_cast<CSubtitleSource*>(m_pFilter))->GetMediaType(pmt);

 }

 

 HRESULT CSubtitleStream::CheckMediaType(const CMediaType* pmt)