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, 61 insertions, 55 deletions

diff --git a/src/apps/mplayerc/FakeFilterMapper2.h b/src/apps/mplayerc/FakeFilterMapper2.h
index ddc1423d3..0cd159c20 100644
--- a/src/apps/mplayerc/FakeFilterMapper2.h
+++ b/src/apps/mplayerc/FakeFilterMapper2.h
@@ -29,34 +29,37 @@
 class FilterOverride

 {

 public:

-	bool fDisabled, fTemporary;

-	enum {REGISTERED, EXTERNAL} type;

-	// REGISTERED

-	CStringW dispname;

-	// EXTERNAL

-	CString path, name;

-	CLSID clsid;

-	// props

-	CAtlList<GUID> guids, backup;

-	enum {PREFERRED, BLOCK, MERIT};

-	int iLoadType;

-	DWORD dwMerit;

-

-	FilterOverride() {fTemporary = false;}

-	FilterOverride(FilterOverride* f)

-	{

-		fDisabled = f->fDisabled;

-		fTemporary = f->fTemporary;

-		type = f->type;

-		dispname = f->dispname;

-		path = f->path;

-		name = f->name;

-		clsid = f->clsid;

-		guids.AddTailList(&f->guids);

-		backup.AddTailList(&f->backup);

-		iLoadType = f->iLoadType;

-		dwMerit = f->dwMerit;

-	}

+    bool fDisabled, fTemporary;

+    enum {REGISTERED, EXTERNAL} type;

+    // REGISTERED

+    CStringW dispname;

+    // EXTERNAL

+    CString path, name;

+    CLSID clsid;

+    // props

+    CAtlList<GUID> guids, backup;

+    enum {PREFERRED, BLOCK, MERIT};

+    int iLoadType;

+    DWORD dwMerit;

+

+    FilterOverride()

+    {

+        fTemporary = false;

+    }

+    FilterOverride(FilterOverride* f)

+    {

+        fDisabled = f->fDisabled;

+        fTemporary = f->fTemporary;

+        type = f->type;

+        dispname = f->dispname;

+        path = f->path;

+        name = f->name;

+        clsid = f->clsid;

+        guids.AddTailList(&f->guids);

+        backup.AddTailList(&f->backup);

+        iLoadType = f->iLoadType;

+        dwMerit = f->dwMerit;

+    }

 };

 /*

 class CFilterMapper2 : protected CUnknown, protected IFilterMapper2

@@ -71,15 +74,15 @@ protected:
 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

 	// IFilterMapper2

-	

+

 	STDMETHODIMP CreateCategory(REFCLSID clsidCategory, DWORD dwCategoryMerit, LPCWSTR Description);

-	STDMETHODIMP UnregisterFilter(const CLSID* pclsidCategory, const OLECHAR* szInstance, REFCLSID Filter);	

+	STDMETHODIMP UnregisterFilter(const CLSID* pclsidCategory, const OLECHAR* szInstance, REFCLSID Filter);

 	STDMETHODIMP RegisterFilter(REFCLSID clsidFilter, LPCWSTR Name, IMoniker** ppMoniker, const CLSID* pclsidCategory, const OLECHAR* szInstance, const REGFILTER2* prf2);

-	STDMETHODIMP EnumMatchingFilters(IEnumMoniker** ppEnum, DWORD dwFlags, BOOL bExactMatch, DWORD dwMerit, 

-		BOOL bInputNeeded, DWORD cInputTypes, const GUID* pInputTypes, const REGPINMEDIUM* pMedIn, const CLSID* pPinCategoryIn, BOOL bRender, 

+	STDMETHODIMP EnumMatchingFilters(IEnumMoniker** ppEnum, DWORD dwFlags, BOOL bExactMatch, DWORD dwMerit,

+		BOOL bInputNeeded, DWORD cInputTypes, const GUID* pInputTypes, const REGPINMEDIUM* pMedIn, const CLSID* pPinCategoryIn, BOOL bRender,

 		BOOL bOutputNeeded, DWORD cOutputTypes, const GUID* pOutputTypes, const REGPINMEDIUM* pMedOut, const CLSID* pPinCategoryOut);

 

-public: 

+public:

 	CFilterMapper2();

 	virtual ~CFilterMapper2();

 

@@ -93,35 +96,38 @@ public:
 

 class CFilterMapper2 : protected CUnknown, public IFilterMapper2

 {

-	static bool fInitialized;

+    static bool fInitialized;

 

-	CComPtr<IUnknown> m_pFM2;

-	CString m_path;

+    CComPtr<IUnknown> m_pFM2;

+    CString m_path;

 

-	bool m_fRefCounted, m_fAllowUnreg;

+    bool m_fRefCounted, m_fAllowUnreg;

 

 protected:

-	DECLARE_IUNKNOWN;

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

+    DECLARE_IUNKNOWN;

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

 

-	// IFilterMapper2

-	

-	STDMETHODIMP CreateCategory(REFCLSID clsidCategory, DWORD dwCategoryMerit, LPCWSTR Description);

-	STDMETHODIMP UnregisterFilter(const CLSID* pclsidCategory, const OLECHAR* szInstance, REFCLSID Filter);	

-	STDMETHODIMP RegisterFilter(REFCLSID clsidFilter, LPCWSTR Name, IMoniker** ppMoniker, const CLSID* pclsidCategory, const OLECHAR* szInstance, const REGFILTER2* prf2);

-	STDMETHODIMP EnumMatchingFilters(IEnumMoniker** ppEnum, DWORD dwFlags, BOOL bExactMatch, DWORD dwMerit, 

-		BOOL bInputNeeded, DWORD cInputTypes, const GUID* pInputTypes, const REGPINMEDIUM* pMedIn, const CLSID* pPinCategoryIn, BOOL bRender, 

-		BOOL bOutputNeeded, DWORD cOutputTypes, const GUID* pOutputTypes, const REGPINMEDIUM* pMedOut, const CLSID* pPinCategoryOut);

+    // IFilterMapper2

 

-public: 

-	CFilterMapper2(bool fRefCounted, bool fAllowUnreg = false, LPUNKNOWN pUnkOuter = NULL);

-	virtual ~CFilterMapper2();

+    STDMETHODIMP CreateCategory(REFCLSID clsidCategory, DWORD dwCategoryMerit, LPCWSTR Description);

+    STDMETHODIMP UnregisterFilter(const CLSID* pclsidCategory, const OLECHAR* szInstance, REFCLSID Filter);

+    STDMETHODIMP RegisterFilter(REFCLSID clsidFilter, LPCWSTR Name, IMoniker** ppMoniker, const CLSID* pclsidCategory, const OLECHAR* szInstance, const REGFILTER2* prf2);

+    STDMETHODIMP EnumMatchingFilters(IEnumMoniker** ppEnum, DWORD dwFlags, BOOL bExactMatch, DWORD dwMerit,

+                                     BOOL bInputNeeded, DWORD cInputTypes, const GUID* pInputTypes, const REGPINMEDIUM* pMedIn, const CLSID* pPinCategoryIn, BOOL bRender,

+                                     BOOL bOutputNeeded, DWORD cOutputTypes, const GUID* pOutputTypes, const REGPINMEDIUM* pMedOut, const CLSID* pPinCategoryOut);

+

+public:

+    CFilterMapper2(bool fRefCounted, bool fAllowUnreg = false, LPUNKNOWN pUnkOuter = NULL);

+    virtual ~CFilterMapper2();

 

-	void SetInner(IUnknown* pUnk) {m_pFM2 = pUnk;}

+    void SetInner(IUnknown* pUnk)

+    {

+        m_pFM2 = pUnk;

+    }

 

-	static void Init();

+    static void Init();

 

-	static IFilterMapper2* m_pFilterMapper2;

-	CList<FilterOverride*> m_filters;

-	void Register(CString path);

+    static IFilterMapper2* m_pFilterMapper2;

+    CList<FilterOverride*> m_filters;

+    void Register(CString path);

 };