revert r1783

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

1 files changed, 26 insertions, 35 deletions

diff --git a/src/DSUtil/NullRenderers.h b/src/DSUtil/NullRenderers.h
index 60047609d..3fdbe6ea2 100644
--- a/src/DSUtil/NullRenderers.h
+++ b/src/DSUtil/NullRenderers.h
@@ -1,4 +1,4 @@
-/*

+/* 

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *

+ *   

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *

+ *   

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */

@@ -26,78 +26,69 @@
 class CNullRenderer : public CBaseRenderer

 {

 protected:

-    virtual HRESULT DoRenderSample(IMediaSample* pSample)

-    {

-        return S_OK;

-    }

+	virtual HRESULT DoRenderSample(IMediaSample* pSample) {return S_OK;}

 

 public:

-    CNullRenderer(REFCLSID clsid, TCHAR* pName, LPUNKNOWN pUnk, HRESULT* phr);

+	CNullRenderer(REFCLSID clsid, TCHAR* pName, LPUNKNOWN pUnk, HRESULT* phr);

 };

 

 [uuid("579883A0-4E2D-481F-9436-467AAFAB7DE8")]

 class CNullVideoRenderer : public CNullRenderer

 {

 protected:

-    HRESULT CheckMediaType(const CMediaType* pmt);

+	HRESULT CheckMediaType(const CMediaType* pmt);

 

 public:

-    CNullVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);

+	CNullVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);

 };

 

 [uuid("DD9ED57D-6ABF-42E8-89A2-11D04798DC58")]

 class CNullUVideoRenderer : public CNullRenderer

 {

 protected:

-    HRESULT CheckMediaType(const CMediaType* pmt);

+	HRESULT CheckMediaType(const CMediaType* pmt);

 

 public:

-    CNullUVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);

-    virtual HRESULT DoRenderSample(IMediaSample* pSample);

+	CNullUVideoRenderer(LPUNKNOWN pUnk, HRESULT* phr);

+	virtual HRESULT DoRenderSample(IMediaSample* pSample);

 };

 

 [uuid("0C38BDFD-8C17-4E00-A344-F89397D3E22A")]

 class CNullAudioRenderer : public CNullRenderer

 {

 protected:

-    HRESULT CheckMediaType(const CMediaType* pmt);

+	HRESULT CheckMediaType(const CMediaType* pmt);

 

 public:

-    CNullAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);

+	CNullAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);

 };

 

 [uuid("64A45125-7343-4772-9DA4-179FAC9D462C")]

 class CNullUAudioRenderer : public CNullRenderer

 {

 protected:

-    HRESULT CheckMediaType(const CMediaType* pmt);

+	HRESULT CheckMediaType(const CMediaType* pmt);

 

 public:

-    CNullUAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);

+	CNullUAudioRenderer(LPUNKNOWN pUnk, HRESULT* phr);

 };

 

 [uuid("655D7613-C26C-4A25-BBBD-3C9C516122CC")]

 class CNullTextRenderer : public CBaseFilter, public CCritSec

 {

-    class CTextInputPin : public CBaseInputPin

-    {

-    public:

-        CTextInputPin(CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr)

-            : CBaseInputPin(NAME("CTextInputPin"), pFilter, pLock, phr, L"In") {}

-        HRESULT CheckMediaType(const CMediaType* pmt);

-    };

+	class CTextInputPin : public CBaseInputPin

+	{

+	public:

+		CTextInputPin(CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr) 

+			: CBaseInputPin(NAME("CTextInputPin"), pFilter, pLock, phr, L"In") {}

+	    HRESULT CheckMediaType(const CMediaType* pmt);

+	};

 

-    CAutoPtr<CTextInputPin> m_pInput;

+	CAutoPtr<CTextInputPin> m_pInput;

 

 public:

-    CNullTextRenderer(LPUNKNOWN pUnk, HRESULT* phr);

-    int GetPinCount()

-    {

-        return (int)!!m_pInput;

-    }

-    CBasePin* GetPin(int n)

-    {

-        return n == 0 ? (CBasePin*)m_pInput : NULL;

-    }

+	CNullTextRenderer(LPUNKNOWN pUnk, HRESULT* phr);

+	int GetPinCount() {return (int)!!m_pInput;}

+	CBasePin* GetPin(int n) {return n == 0 ? (CBasePin*)m_pInput : NULL;}

 };