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, 90 insertions, 86 deletions

diff --git a/src/apps/mplayerc/FGManager.h b/src/apps/mplayerc/FGManager.h
index 33cb7970e..f1f0ed25c 100644
--- a/src/apps/mplayerc/FGManager.h
+++ b/src/apps/mplayerc/FGManager.h
@@ -28,144 +28,148 @@
 

 

 class CFGManager

-	: public CUnknown

-	, public IGraphBuilder2

-	, public IGraphBuilderDeadEnd

-	, public CCritSec

+    : public CUnknown

+    , public IGraphBuilder2

+    , public IGraphBuilderDeadEnd

+    , public CCritSec

 {

 public:

-	struct path_t {CLSID clsid; CString filter, pin;};

-

-	class CStreamPath : public CAtlList<path_t> 

-	{

-	public: 

-		void Append(IBaseFilter* pBF, IPin* pPin); 

-		bool Compare(const CStreamPath& path);

-	};

-

-	class CStreamDeadEnd : public CStreamPath 

-	{

-	public: 

-		CAtlList<CMediaType> mts;

-	};

+    struct path_t

+    {

+        CLSID clsid;

+        CString filter, pin;

+    };

+

+    class CStreamPath : public CAtlList<path_t>

+    {

+    public:

+        void Append(IBaseFilter* pBF, IPin* pPin);

+        bool Compare(const CStreamPath& path);

+    };

+

+    class CStreamDeadEnd : public CStreamPath

+    {

+    public:

+        CAtlList<CMediaType> mts;

+    };

 

 private:

-	CComPtr<IUnknown> m_pUnkInner;

-	DWORD m_dwRegister;

+    CComPtr<IUnknown> m_pUnkInner;

+    DWORD m_dwRegister;

 

-	CStreamPath m_streampath;

-	CAutoPtrArray<CStreamDeadEnd> m_deadends;

+    CStreamPath m_streampath;

+    CAutoPtrArray<CStreamDeadEnd> m_deadends;

 

 protected:

-	CComPtr<IFilterMapper2> m_pFM;

-	CInterfaceList<IUnknown, &IID_IUnknown> m_pUnks;

-	CAtlList<CFGFilter*> m_source, m_transform, m_override;

+    CComPtr<IFilterMapper2> m_pFM;

+    CInterfaceList<IUnknown, &IID_IUnknown> m_pUnks;

+    CAtlList<CFGFilter*> m_source, m_transform, m_override;

 

-	static bool CheckBytes(HANDLE hFile, CString chkbytes);

+    static bool CheckBytes(HANDLE hFile, CString chkbytes);

 

-	HRESULT EnumSourceFilters(LPCWSTR lpcwstrFileName, CFGFilterList& fl);

-	HRESULT AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppBF);

-	HRESULT Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender);

+    HRESULT EnumSourceFilters(LPCWSTR lpcwstrFileName, CFGFilterList& fl);

+    HRESULT AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppBF);

+    HRESULT Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender);

 

-	// IFilterGraph

+    // IFilterGraph

 

-	STDMETHODIMP AddFilter(IBaseFilter* pFilter, LPCWSTR pName);

-	STDMETHODIMP RemoveFilter(IBaseFilter* pFilter);

-	STDMETHODIMP EnumFilters(IEnumFilters** ppEnum);

-	STDMETHODIMP FindFilterByName(LPCWSTR pName, IBaseFilter** ppFilter);

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

-	STDMETHODIMP Reconnect(IPin* ppin);

-	STDMETHODIMP Disconnect(IPin* ppin);

-	STDMETHODIMP SetDefaultSyncSource();

+    STDMETHODIMP AddFilter(IBaseFilter* pFilter, LPCWSTR pName);

+    STDMETHODIMP RemoveFilter(IBaseFilter* pFilter);

+    STDMETHODIMP EnumFilters(IEnumFilters** ppEnum);

+    STDMETHODIMP FindFilterByName(LPCWSTR pName, IBaseFilter** ppFilter);

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

+    STDMETHODIMP Reconnect(IPin* ppin);

+    STDMETHODIMP Disconnect(IPin* ppin);

+    STDMETHODIMP SetDefaultSyncSource();

 

-	// IGraphBuilder

+    // IGraphBuilder

 

-	STDMETHODIMP Connect(IPin* pPinOut, IPin* pPinIn);

-	STDMETHODIMP Render(IPin* pPinOut);

-	STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

-	STDMETHODIMP AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

-	STDMETHODIMP SetLogFile(DWORD_PTR hFile);

-	STDMETHODIMP Abort();

-	STDMETHODIMP ShouldOperationContinue();

+    STDMETHODIMP Connect(IPin* pPinOut, IPin* pPinIn);

+    STDMETHODIMP Render(IPin* pPinOut);

+    STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+    STDMETHODIMP AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

+    STDMETHODIMP SetLogFile(DWORD_PTR hFile);

+    STDMETHODIMP Abort();

+    STDMETHODIMP ShouldOperationContinue();

 

-	// IFilterGraph2

+    // IFilterGraph2

 

-	STDMETHODIMP AddSourceFilterForMoniker(IMoniker* pMoniker, IBindCtx* pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

-	STDMETHODIMP ReconnectEx(IPin* ppin, const AM_MEDIA_TYPE* pmt);

-	STDMETHODIMP RenderEx(IPin* pPinOut, DWORD dwFlags, DWORD* pvContext);

+    STDMETHODIMP AddSourceFilterForMoniker(IMoniker* pMoniker, IBindCtx* pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

+    STDMETHODIMP ReconnectEx(IPin* ppin, const AM_MEDIA_TYPE* pmt);

+    STDMETHODIMP RenderEx(IPin* pPinOut, DWORD dwFlags, DWORD* pvContext);

 

-	// IGraphBuilder2

+    // IGraphBuilder2

 

-	STDMETHODIMP IsPinDirection(IPin* pPin, PIN_DIRECTION dir);

-	STDMETHODIMP IsPinConnected(IPin* pPin);

-	STDMETHODIMP ConnectFilter(IBaseFilter* pBF, IPin* pPinIn);

-	STDMETHODIMP ConnectFilter(IPin* pPinOut, IBaseFilter* pBF);

-	STDMETHODIMP ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, const AM_MEDIA_TYPE* pmt);

-	STDMETHODIMP NukeDownstream(IUnknown* pUnk);

-	STDMETHODIMP FindInterface(REFIID iid, void** ppv, BOOL bRemove);

-	STDMETHODIMP AddToROT();

-	STDMETHODIMP RemoveFromROT();

+    STDMETHODIMP IsPinDirection(IPin* pPin, PIN_DIRECTION dir);

+    STDMETHODIMP IsPinConnected(IPin* pPin);

+    STDMETHODIMP ConnectFilter(IBaseFilter* pBF, IPin* pPinIn);

+    STDMETHODIMP ConnectFilter(IPin* pPinOut, IBaseFilter* pBF);

+    STDMETHODIMP ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, const AM_MEDIA_TYPE* pmt);

+    STDMETHODIMP NukeDownstream(IUnknown* pUnk);

+    STDMETHODIMP FindInterface(REFIID iid, void** ppv, BOOL bRemove);

+    STDMETHODIMP AddToROT();

+    STDMETHODIMP RemoveFromROT();

 

-	// IGraphBuilderDeadEnd

+    // IGraphBuilderDeadEnd

 

-	STDMETHODIMP_(size_t) GetCount();

-	STDMETHODIMP GetDeadEnd(int iIndex, CAtlList<CStringW>& path, CAtlList<CMediaType>& mts);

+    STDMETHODIMP_(size_t) GetCount();

+    STDMETHODIMP GetDeadEnd(int iIndex, CAtlList<CStringW>& path, CAtlList<CMediaType>& mts);

 

 public:

-	CFGManager(LPCTSTR pName, LPUNKNOWN pUnk);

-	virtual ~CFGManager();

+    CFGManager(LPCTSTR pName, LPUNKNOWN pUnk);

+    virtual ~CFGManager();

 

-	DECLARE_IUNKNOWN;

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

+    DECLARE_IUNKNOWN;

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

 };

 

 class CFGManagerCustom : public CFGManager

 {

 public:

-	// IFilterGraph

+    // IFilterGraph

 

-	STDMETHODIMP AddFilter(IBaseFilter* pFilter, LPCWSTR pName);

+    STDMETHODIMP AddFilter(IBaseFilter* pFilter, LPCWSTR pName);

 

 public:

-	CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk);

+    CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk);

 };

 

 class CFGManagerPlayer : public CFGManagerCustom

 {

 protected:

-	HWND m_hWnd;

-	UINT64 m_vrmerit, m_armerit;

+    HWND m_hWnd;

+    UINT64 m_vrmerit, m_armerit;

 

-	// IFilterGraph

+    // IFilterGraph

 

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

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

 

 public:

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

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

 };

 

 class CFGManagerDVD : public CFGManagerPlayer

 {

 protected:

-	// IGraphBuilder

+    // IGraphBuilder

 

-	STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

-	STDMETHODIMP AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

+    STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+    STDMETHODIMP AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

 

 public:

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

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

 };

 

 class CFGManagerCapture : public CFGManagerPlayer

 {

 public:

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

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

 };

 

 class CFGManagerMuxer : public CFGManagerCustom

 {

 public:

-	CFGManagerMuxer(LPCTSTR pName, LPUNKNOWN pUnk);

+    CFGManagerMuxer(LPCTSTR pName, LPUNKNOWN pUnk);

 };

 

 //

@@ -173,12 +177,12 @@ public:
 class CFGAggregator : public CUnknown

 {

 protected:

-	CComPtr<IUnknown> m_pUnkInner;

+    CComPtr<IUnknown> m_pUnkInner;

 

 public:

-	CFGAggregator(const CLSID& clsid, LPCTSTR pName, LPUNKNOWN pUnk, HRESULT& hr);

-	virtual ~CFGAggregator();

+    CFGAggregator(const CLSID& clsid, LPCTSTR pName, LPUNKNOWN pUnk, HRESULT& hr);

+    virtual ~CFGAggregator();

 

-	DECLARE_IUNKNOWN;

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

+    DECLARE_IUNKNOWN;

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

 };