Style patch part1. based on newly released astyle 1.24.

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

1 files changed, 142 insertions, 129 deletions

diff --git a/src/apps/mplayerc/FGManagerBDA.h b/src/apps/mplayerc/FGManagerBDA.h
index cd50b1c30..58ad1c3ff 100644
--- a/src/apps/mplayerc/FGManagerBDA.h
+++ b/src/apps/mplayerc/FGManagerBDA.h
@@ -1,4 +1,4 @@
-/* 

+/*

  * $Id$

  *

  * (C) 2006-2010 see AUTHORS

@@ -33,148 +33,161 @@
 class CDVBStream

 {

 public :

-	CDVBStream() :

-		m_ulMappedPID(0)

-	{

-	}

-

-	CDVBStream(LPWSTR strName, const AM_MEDIA_TYPE * pmt, bool bFindExisting = false, MEDIA_SAMPLE_CONTENT nMsc=MEDIA_ELEMENTARY_STREAM) :

-		m_Name(strName),

-		m_bFindExisting(bFindExisting),

-		m_pmt(pmt),

-		m_nMsc(nMsc),

-		m_ulMappedPID(0)

-	{}

-

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

-	{

-		CComPtr<IPin>		pPinOut;

-		PIN_INFO			PinInfo;

-

-		m_pMap = pPin;

-		if (m_pMap &&

-			SUCCEEDED (pPin->ConnectedTo (&pPinOut)) &&

-			SUCCEEDED (pPinOut->QueryPinInfo (&PinInfo)))

-		{

-			m_pFilter.Attach (PinInfo.pFilter);

-		}

-	}

-

-	HRESULT Map (ULONG ulPID)

-	{

-		CheckPointer (m_pMap, E_UNEXPECTED);

-		ClearMaps();

-		m_ulMappedPID = ulPID;

-		return m_pMap->MapPID (1, &ulPID, m_nMsc);

-	}

-

-	HRESULT Unmap (ULONG ulPID)

-	{

-		CheckPointer (m_pMap, E_UNEXPECTED);

-		m_ulMappedPID = 0;

-		return m_pMap->UnmapPID (1, &ulPID);

-	}

-

-	ULONG GetMappedPID() const

-	{

-		return m_ulMappedPID;

-	}

+    CDVBStream() :

+        m_ulMappedPID(0)

+    {

+    }

+

+    CDVBStream(LPWSTR strName, const AM_MEDIA_TYPE * pmt, bool bFindExisting = false, MEDIA_SAMPLE_CONTENT nMsc=MEDIA_ELEMENTARY_STREAM) :

+        m_Name(strName),

+        m_bFindExisting(bFindExisting),

+        m_pmt(pmt),

+        m_nMsc(nMsc),

+        m_ulMappedPID(0)

+    {}

+

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

+    {

+        CComPtr<IPin>		pPinOut;

+        PIN_INFO			PinInfo;

+

+        m_pMap = pPin;

+        if (m_pMap &&

+            SUCCEEDED (pPin->ConnectedTo (&pPinOut)) &&

+            SUCCEEDED (pPinOut->QueryPinInfo (&PinInfo)))

+        {

+            m_pFilter.Attach (PinInfo.pFilter);

+        }

+    }

+

+    HRESULT Map (ULONG ulPID)

+    {

+        CheckPointer (m_pMap, E_UNEXPECTED);

+        ClearMaps();

+        m_ulMappedPID = ulPID;

+        return m_pMap->MapPID (1, &ulPID, m_nMsc);

+    }

+

+    HRESULT Unmap (ULONG ulPID)

+    {

+        CheckPointer (m_pMap, E_UNEXPECTED);

+        m_ulMappedPID = 0;

+        return m_pMap->UnmapPID (1, &ulPID);

+    }

+

+    ULONG GetMappedPID() const

+    {

+        return m_ulMappedPID;

+    }

 

 private :

-	CComQIPtr<IMPEG2PIDMap>	m_pMap;

-	CComPtr<IBaseFilter>	m_pFilter;

-	const AM_MEDIA_TYPE*	m_pmt;

-	bool					m_bFindExisting;

-	LPWSTR					m_Name;

-	MEDIA_SAMPLE_CONTENT	m_nMsc;

-	ULONG					m_ulMappedPID;

-

-	void ClearMaps()

-	{

-		HRESULT					hr;

-		CComPtr<IEnumPIDMap>	pEnumMap;

-

-		if (SUCCEEDED(hr = m_pMap->EnumPIDMap(&pEnumMap))) 

-		{

-			PID_MAP maps[8];

-			ULONG	nbPids = 0;

-

-			if (pEnumMap->Next(_countof(maps), maps, &nbPids)==S_OK) 

-			{

-				for (ULONG i=0; i<nbPids; i++) 

-				{

-					ULONG	pid = maps[i].ulPID;

-

-					m_pMap->UnmapPID(1, &pid);

-				}

-			}

-		}

-	}

+    CComQIPtr<IMPEG2PIDMap>	m_pMap;

+    CComPtr<IBaseFilter>	m_pFilter;

+    const AM_MEDIA_TYPE*	m_pmt;

+    bool					m_bFindExisting;

+    LPWSTR					m_Name;

+    MEDIA_SAMPLE_CONTENT	m_nMsc;

+    ULONG					m_ulMappedPID;

+

+    void ClearMaps()

+    {

+        HRESULT					hr;

+        CComPtr<IEnumPIDMap>	pEnumMap;

+

+        if (SUCCEEDED(hr = m_pMap->EnumPIDMap(&pEnumMap)))

+        {

+            PID_MAP maps[8];

+            ULONG	nbPids = 0;

+

+            if (pEnumMap->Next(_countof(maps), maps, &nbPids)==S_OK)

+            {

+                for (ULONG i=0; i<nbPids; i++)

+                {

+                    ULONG	pid = maps[i].ulPID;

+

+                    m_pMap->UnmapPID(1, &pid);

+                }

+            }

+        }

+    }

 };

 

 

 class CFGManagerBDA : public CFGManagerPlayer, IBDATuner, IAMStreamSelect

 {

 public:

-	CFGManagerBDA(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd);

-	~CFGManagerBDA();

+    CFGManagerBDA(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd);

+    ~CFGManagerBDA();

 

-	// IGraphBuilder

-	STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+    // IGraphBuilder

+    STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

 

-	// IFilterGraph

-	STDMETHODIMP ConnectDirect(IPin* pPinOut, IPin* pPinIn, const AM_MEDIA_TYPE* pmt);

+    // IFilterGraph

+    STDMETHODIMP ConnectDirect(IPin* pPinOut, IPin* pPinIn, const AM_MEDIA_TYPE* pmt);

 

-	// IBDATuner

-	STDMETHODIMP SetChannel	(int nChannelPrefNumber);

-	STDMETHODIMP SetAudio	(int nAudioIndex);

-	STDMETHODIMP SetFrequency(ULONG freq);

-	STDMETHODIMP Scan(ULONG ulFrequency, HWND hWnd);

-	STDMETHODIMP GetStats (BOOLEAN& bPresent, BOOLEAN& bLocked, LONG& lStrength, LONG& lQuality);

+    // IBDATuner

+    STDMETHODIMP SetChannel	(int nChannelPrefNumber);

+    STDMETHODIMP SetAudio	(int nAudioIndex);

+    STDMETHODIMP SetFrequency(ULONG freq);

+    STDMETHODIMP Scan(ULONG ulFrequency, HWND hWnd);

+    STDMETHODIMP GetStats (BOOLEAN& bPresent, BOOLEAN& bLocked, LONG& lStrength, LONG& lQuality);

 

-	// IAMStreamSelect

-	STDMETHODIMP Count(DWORD* pcStreams); 

-	STDMETHODIMP Enable(long lIndex, DWORD dwFlags); 

-	STDMETHODIMP Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD* pdwFlags, LCID* plcid, DWORD* pdwGroup, WCHAR** ppszName, IUnknown** ppObject, IUnknown** ppUnk);  

+    // IAMStreamSelect

+    STDMETHODIMP Count(DWORD* pcStreams);

+    STDMETHODIMP Enable(long lIndex, DWORD dwFlags);

+    STDMETHODIMP Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD* pdwFlags, LCID* plcid, DWORD* pdwGroup, WCHAR** ppszName, IUnknown** ppObject, IUnknown** ppUnk);

 

-	DECLARE_IUNKNOWN;

-	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+    DECLARE_IUNKNOWN;

+    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

 private :

 

-	CComQIPtr<IBDA_DeviceControl>			m_pBDAControl;

-	CComPtr<IBDA_FrequencyFilter>			m_pBDAFreq;

-	CComPtr<IBDA_SignalStatistics>			m_pBDAStats;

-	CAtlMap<DVB_STREAM_TYPE, CDVBStream>	m_DVBStreams;

-

-	DVB_STREAM_TYPE							m_nCurVideoType;

-	DVB_STREAM_TYPE							m_nCurAudioType;

-	CString									m_BDANetworkProvider;

-

-	HRESULT			CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, CStringW& DisplayName);

-	HRESULT			ConnectFilters(IBaseFilter* pOutFiter, IBaseFilter* pInFilter);

-	HRESULT			CreateMicrosoftDemux(IBaseFilter* pReceiver, CComPtr<IBaseFilter>& pMpeg2Demux);

-	HRESULT			SetChannelInternal (CDVBChannel* pChannel);

-	HRESULT			SwitchStream (DVB_STREAM_TYPE& nOldType, DVB_STREAM_TYPE nNewType);

-	HRESULT			ChangeState(FILTER_STATE nRequested);

-	FILTER_STATE	GetState();

-

-	template <class ITF>

-		HRESULT SearchIBDATopology(const CComPtr<IBaseFilter> & pTuner, CComPtr<ITF> & pItf)

-	{

-		CComPtr<IUnknown>	pUnk;

-		HRESULT				hr = SearchIBDATopology(pTuner, __uuidof(ITF), pUnk);

-

-		if (SUCCEEDED(hr)) {

-			hr = pUnk.QueryInterface(&pItf);

-		}

-		return !pItf ? E_NOINTERFACE : hr;

-	}

-

-	HRESULT		SearchIBDATopology(const CComPtr<IBaseFilter>& pTuner, REFIID iid, CComPtr<IUnknown>& pUnk);

+    CComQIPtr<IBDA_DeviceControl>			m_pBDAControl;

+    CComPtr<IBDA_FrequencyFilter>			m_pBDAFreq;

+    CComPtr<IBDA_SignalStatistics>			m_pBDAStats;

+    CAtlMap<DVB_STREAM_TYPE, CDVBStream>	m_DVBStreams;

+

+    DVB_STREAM_TYPE							m_nCurVideoType;

+    DVB_STREAM_TYPE							m_nCurAudioType;

+    CString									m_BDANetworkProvider;

+

+    HRESULT			CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, CStringW& DisplayName);

+    HRESULT			ConnectFilters(IBaseFilter* pOutFiter, IBaseFilter* pInFilter);

+    HRESULT			CreateMicrosoftDemux(IBaseFilter* pReceiver, CComPtr<IBaseFilter>& pMpeg2Demux);

+    HRESULT			SetChannelInternal (CDVBChannel* pChannel);

+    HRESULT			SwitchStream (DVB_STREAM_TYPE& nOldType, DVB_STREAM_TYPE nNewType);

+    HRESULT			ChangeState(FILTER_STATE nRequested);

+    FILTER_STATE	GetState();

+

+    template <class ITF>

+    HRESULT SearchIBDATopology(const CComPtr<IBaseFilter> & pTuner, CComPtr<ITF> & pItf)

+    {

+        CComPtr<IUnknown>	pUnk;

+        HRESULT				hr = SearchIBDATopology(pTuner, __uuidof(ITF), pUnk);

+

+        if (SUCCEEDED(hr))

+        {

+            hr = pUnk.QueryInterface(&pItf);

+        }

+        return !pItf ? E_NOINTERFACE : hr;

+    }

+

+    HRESULT		SearchIBDATopology(const CComPtr<IBaseFilter>& pTuner, REFIID iid, CComPtr<IUnknown>& pUnk);

 };