astyle formatting cleanup to make the sourcecode more accessible

switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/

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

1 files changed, 103 insertions, 103 deletions

diff --git a/src/apps/mplayerc/DVBChannel.cpp b/src/apps/mplayerc/DVBChannel.cpp
index df4f30635..3e3fd2456 100644
--- a/src/apps/mplayerc/DVBChannel.cpp
+++ b/src/apps/mplayerc/DVBChannel.cpp
@@ -1,4 +1,4 @@
-/* 

+/*

  * $Id$

  *

  * (C) 2006-2010 see AUTHORS

@@ -28,18 +28,18 @@
 

 CDVBChannel::CDVBChannel(void)

 {

-	m_ulFrequency		= 0;

-	m_nPrefNumber		= 0;

-	m_nOriginNumber		= 0;

-	m_ulONID			= 0;

-	m_ulTSID			= 0;

-	m_ulSID				= 0;

-	m_ulPMT				= 0;

-	m_ulPCR				= 0;

-	m_ulVideoPID		= 0;

-	m_nVideoType		= DVB_MPV;

-	m_nAudioCount		= 0;

-	m_nSubtitleCount	= 0;

+    m_ulFrequency		= 0;

+    m_nPrefNumber		= 0;

+    m_nOriginNumber		= 0;

+    m_ulONID			= 0;

+    m_ulTSID			= 0;

+    m_ulSID				= 0;

+    m_ulPMT				= 0;

+    m_ulPCR				= 0;

+    m_ulVideoPID		= 0;

+    m_nVideoType		= DVB_MPV;

+    m_nAudioCount		= 0;

+    m_nSubtitleCount	= 0;

 }

 

 CDVBChannel::~CDVBChannel(void)

@@ -49,107 +49,107 @@ CDVBChannel::~CDVBChannel(void)
 

 void CDVBChannel::FromString(CString strValue)

 {

-	int		i = 0;

-	int		nVersion;

-	

-	nVersion		= _tstol(strValue.Tokenize(_T("|"), i));

-	m_strName		= strValue.Tokenize(_T("|"), i); 

-	m_ulFrequency	= _tstol(strValue.Tokenize(_T("|"), i));

-	m_nPrefNumber	= _tstol(strValue.Tokenize(_T("|"), i));

-	m_nOriginNumber	= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulONID		= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulTSID		= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulSID			= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulPMT			= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulPCR			= _tstol(strValue.Tokenize(_T("|"), i));

-	m_ulVideoPID	= _tstol(strValue.Tokenize(_T("|"), i));

-	m_nVideoType	= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

-	m_nAudioCount	= _tstol(strValue.Tokenize(_T("|"), i));

-	m_nSubtitleCount = _tstol(strValue.Tokenize(_T("|"), i));

-

-	for(int j=0; j<m_nAudioCount; j++)

-	{

-		m_Audios[j].PID			= _tstol(strValue.Tokenize(_T("|"), i));

-		m_Audios[j].Type		= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

-		m_Audios[j].PesType		= (PES_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

-		m_Audios[j].Language	= strValue.Tokenize(_T("|"), i);

-	}

-

-	for(int j=0; j<m_nSubtitleCount; j++)

-	{

-		m_Subtitles[j].PID		= _tstol(strValue.Tokenize(_T("|"), i));

-		m_Subtitles[j].Type		= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

-		m_Subtitles[j].PesType	= (PES_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

-		m_Subtitles[j].Language	= strValue.Tokenize(_T("|"), i);

-	}

+    int		i = 0;

+    int		nVersion;

+

+    nVersion		= _tstol(strValue.Tokenize(_T("|"), i));

+    m_strName		= strValue.Tokenize(_T("|"), i);

+    m_ulFrequency	= _tstol(strValue.Tokenize(_T("|"), i));

+    m_nPrefNumber	= _tstol(strValue.Tokenize(_T("|"), i));

+    m_nOriginNumber	= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulONID		= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulTSID		= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulSID			= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulPMT			= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulPCR			= _tstol(strValue.Tokenize(_T("|"), i));

+    m_ulVideoPID	= _tstol(strValue.Tokenize(_T("|"), i));

+    m_nVideoType	= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

+    m_nAudioCount	= _tstol(strValue.Tokenize(_T("|"), i));

+    m_nSubtitleCount = _tstol(strValue.Tokenize(_T("|"), i));

+

+    for(int j = 0; j < m_nAudioCount; j++)

+    {

+        m_Audios[j].PID			= _tstol(strValue.Tokenize(_T("|"), i));

+        m_Audios[j].Type		= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

+        m_Audios[j].PesType		= (PES_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

+        m_Audios[j].Language	= strValue.Tokenize(_T("|"), i);

+    }

+

+    for(int j = 0; j < m_nSubtitleCount; j++)

+    {

+        m_Subtitles[j].PID		= _tstol(strValue.Tokenize(_T("|"), i));

+        m_Subtitles[j].Type		= (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

+        m_Subtitles[j].PesType	= (PES_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));

+        m_Subtitles[j].Language	= strValue.Tokenize(_T("|"), i);

+    }

 }

 

 

 CString CDVBChannel::ToString()

 {

-	CString		strValue;

-	strValue.AppendFormat (_T("%d|%s|%ld|%d|%d|%ld|%ld|%ld|%ld|%ld|%ld|%d|%ld|%ld"),

-							FORMAT_VERSION,

-						    m_strName,

-							m_ulFrequency,

-							m_nPrefNumber,

-							m_nOriginNumber,

-							m_ulONID,

-							m_ulTSID,

-							m_ulSID,

-							m_ulPMT,

-							m_ulPCR,

-							m_ulVideoPID,

-							m_nVideoType,

-							m_nAudioCount,

-							m_nSubtitleCount);

-

-	for(int i=0; i<m_nAudioCount; i++)

-		strValue.AppendFormat (_T("|%ld|%d|%d|%s"), m_Audios[i].PID, m_Audios[i].Type, m_Audios[i].PesType, m_Audios[i].Language);

-

-	for(int i=0; i<m_nSubtitleCount; i++)

-		strValue.AppendFormat (_T("|%ld|%d|%d|%s"), m_Subtitles[i].PID, m_Subtitles[i].Type, m_Subtitles[i].PesType, m_Subtitles[i].Language);

-

-	return strValue;

+    CString		strValue;

+    strValue.AppendFormat(_T("%d|%s|%ld|%d|%d|%ld|%ld|%ld|%ld|%ld|%ld|%d|%ld|%ld"),

+                          FORMAT_VERSION,

+                          m_strName,

+                          m_ulFrequency,

+                          m_nPrefNumber,

+                          m_nOriginNumber,

+                          m_ulONID,

+                          m_ulTSID,

+                          m_ulSID,

+                          m_ulPMT,

+                          m_ulPCR,

+                          m_ulVideoPID,

+                          m_nVideoType,

+                          m_nAudioCount,

+                          m_nSubtitleCount);

+

+    for(int i = 0; i < m_nAudioCount; i++)

+        strValue.AppendFormat(_T("|%ld|%d|%d|%s"), m_Audios[i].PID, m_Audios[i].Type, m_Audios[i].PesType, m_Audios[i].Language);

+

+    for(int i = 0; i < m_nSubtitleCount; i++)

+        strValue.AppendFormat(_T("|%ld|%d|%d|%s"), m_Subtitles[i].PID, m_Subtitles[i].Type, m_Subtitles[i].PesType, m_Subtitles[i].Language);

+

+    return strValue;

 }

 

 

 void CDVBChannel::SetName(BYTE* Value)

 {

-	USES_CONVERSION;

-	m_strName = A2W ((LPCSTR)Value);

+    USES_CONVERSION;

+    m_strName = A2W((LPCSTR)Value);

 }

 

-void CDVBChannel::AddStreamInfo (ULONG ulPID, DVB_STREAM_TYPE nType, PES_STREAM_TYPE nPesType, LPCTSTR strLanguage)

+void CDVBChannel::AddStreamInfo(ULONG ulPID, DVB_STREAM_TYPE nType, PES_STREAM_TYPE nPesType, LPCTSTR strLanguage)

 {

-	switch (nType)

-	{

-	case DVB_MPV :

-	case DVB_H264 :

-		m_ulVideoPID	= ulPID;

-		m_nVideoType	= nType;

-		break;

-	case DVB_MPA :

-	case DVB_AC3 :

-	case DVB_EAC3 :

-		if (m_nAudioCount < DVB_MAX_AUDIO)

-		{

-			m_Audios[m_nAudioCount].PID			= ulPID;

-			m_Audios[m_nAudioCount].Type		= nType;

-			m_Audios[m_nAudioCount].PesType		= nPesType;

-			m_Audios[m_nAudioCount].Language	= strLanguage;

-			m_nAudioCount++;

-		}

-		break;

-	case DVB_SUBTITLE :

-		if (m_nSubtitleCount < DVB_MAX_SUBTITLE)

-		{

-			m_Subtitles[m_nSubtitleCount].PID		= ulPID;

-			m_Subtitles[m_nSubtitleCount].Type		= nType;

-			m_Subtitles[m_nSubtitleCount].PesType	= nPesType;

-			m_Subtitles[m_nSubtitleCount].Language	= strLanguage;

-			m_nSubtitleCount++;

-		}

-		break;

-	}

+    switch(nType)

+    {

+    case DVB_MPV :

+    case DVB_H264 :

+        m_ulVideoPID	= ulPID;

+        m_nVideoType	= nType;

+        break;

+    case DVB_MPA :

+    case DVB_AC3 :

+    case DVB_EAC3 :

+        if(m_nAudioCount < DVB_MAX_AUDIO)

+        {

+            m_Audios[m_nAudioCount].PID			= ulPID;

+            m_Audios[m_nAudioCount].Type		= nType;

+            m_Audios[m_nAudioCount].PesType		= nPesType;

+            m_Audios[m_nAudioCount].Language	= strLanguage;

+            m_nAudioCount++;

+        }

+        break;

+    case DVB_SUBTITLE :

+        if(m_nSubtitleCount < DVB_MAX_SUBTITLE)

+        {

+            m_Subtitles[m_nSubtitleCount].PID		= ulPID;

+            m_Subtitles[m_nSubtitleCount].Type		= nType;

+            m_Subtitles[m_nSubtitleCount].PesType	= nPesType;

+            m_Subtitles[m_nSubtitleCount].Language	= strLanguage;

+            m_nSubtitleCount++;

+        }

+        break;

+    }

 }
\ No newline at end of file