revert r1783

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

1 files changed, 72 insertions, 76 deletions

diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h
index b89e92f02..68bcdd2e0 100644
--- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h
+++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.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

  *

  */

@@ -30,52 +30,49 @@
 

 class CMatroskaMuxerInputPin : public CBaseInputPin

 {

-    CAutoPtr<MatroskaWriter::TrackEntry> m_pTE;

-    CAutoPtrArray<MatroskaWriter::CBinary> m_pVorbisHdrs;

+	CAutoPtr<MatroskaWriter::TrackEntry> m_pTE;

+	CAutoPtrArray<MatroskaWriter::CBinary> m_pVorbisHdrs;

 

-    bool m_fActive;

-    CCritSec m_csReceive;

+	bool m_fActive;

+	CCritSec m_csReceive;

 

-    REFERENCE_TIME m_rtLastStart, m_rtLastStop;

+	REFERENCE_TIME m_rtLastStart, m_rtLastStop;

 

 public:

-    CMatroskaMuxerInputPin(LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr);

-    virtual ~CMatroskaMuxerInputPin();

+	CMatroskaMuxerInputPin(LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr);

+	virtual ~CMatroskaMuxerInputPin();

 

-    DECLARE_IUNKNOWN;

+	DECLARE_IUNKNOWN;

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

 

-    MatroskaWriter::TrackEntry* GetTrackEntry()

-    {

-        return m_pTE;

-    }

+	MatroskaWriter::TrackEntry* GetTrackEntry() {return m_pTE;}

 

-    REFERENCE_TIME m_rtDur;

+	REFERENCE_TIME m_rtDur;

 

-    CCritSec m_csQueue;

-    CAutoPtrList<MatroskaWriter::BlockGroup> m_blocks;

-    bool m_fEndOfStreamReceived;

+	CCritSec m_csQueue;

+	CAutoPtrList<MatroskaWriter::BlockGroup> m_blocks;

+	bool m_fEndOfStreamReceived;

 

     HRESULT CheckMediaType(const CMediaType* pmt);

     HRESULT BreakConnect();

     HRESULT CompleteConnect(IPin* pPin);

-    HRESULT Active(), Inactive();

+	HRESULT Active(), Inactive();

 

     STDMETHODIMP NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate);

-    STDMETHODIMP BeginFlush();

-    STDMETHODIMP EndFlush();

+	STDMETHODIMP BeginFlush();

+	STDMETHODIMP EndFlush();

 

-    STDMETHODIMP Receive(IMediaSample* pSample);

+	STDMETHODIMP Receive(IMediaSample* pSample);

     STDMETHODIMP EndOfStream();

 };

 

 class CMatroskaMuxerOutputPin : public CBaseOutputPin

 {

 public:

-    CMatroskaMuxerOutputPin(TCHAR* pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr);

-    virtual ~CMatroskaMuxerOutputPin();

+	CMatroskaMuxerOutputPin(TCHAR* pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr);

+	virtual ~CMatroskaMuxerOutputPin();

 

-    DECLARE_IUNKNOWN;

+	DECLARE_IUNKNOWN;

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

 

     HRESULT DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties);

@@ -83,80 +80,79 @@ public:
     HRESULT CheckMediaType(const CMediaType* pmt);

     HRESULT GetMediaType(int iPosition, CMediaType* pmt);

 

-    STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);

+	STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);

 };

 

 [uuid("38E2D43D-915D-493C-B373-888DB16EE3DC")]

-interface IMatroskaMuxer :

-public IUnknown

+interface IMatroskaMuxer : public IUnknown

 {

-    STDMETHOD(CorrectTimeOffset)(bool fNegative, bool fPositive) = 0;

-    // TODO: chapters

+	STDMETHOD (CorrectTimeOffset) (bool fNegative, bool fPositive) = 0;

+	// TODO: chapters

 };

 

 [uuid("1E1299A2-9D42-4F12-8791-D79E376F4143")]

 class CMatroskaMuxerFilter

-    : public CBaseFilter

-    , public CCritSec

-    , public CAMThread

-    , public IAMFilterMiscFlags

-    , public IMediaSeeking

-    , public IMatroskaMuxer

+	: public CBaseFilter

+	, public CCritSec

+	, public CAMThread

+	, public IAMFilterMiscFlags

+	, public IMediaSeeking

+	, public IMatroskaMuxer

 {

 protected:

-    CAutoPtrList<CMatroskaMuxerInputPin> m_pInputs;

-    CAutoPtr<CMatroskaMuxerOutputPin> m_pOutput;

+	CAutoPtrList<CMatroskaMuxerInputPin> m_pInputs;

+	CAutoPtr<CMatroskaMuxerOutputPin> m_pOutput;

 

-    REFERENCE_TIME m_rtCurrent;

+	REFERENCE_TIME m_rtCurrent;

 

-    bool m_fNegative, m_fPositive;

+	bool m_fNegative, m_fPositive;

 

-    enum {CMD_EXIT, CMD_RUN};

-    DWORD ThreadProc();

+	enum {CMD_EXIT, CMD_RUN};

+	DWORD ThreadProc();

 

 public:

-    CMatroskaMuxerFilter(LPUNKNOWN pUnk, HRESULT* phr);

-    virtual ~CMatroskaMuxerFilter();

+	CMatroskaMuxerFilter(LPUNKNOWN pUnk, HRESULT* phr);

+	virtual ~CMatroskaMuxerFilter();

 

-    DECLARE_IUNKNOWN;

+	DECLARE_IUNKNOWN;

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

 

-    void AddInput();

-    UINT GetTrackNumber(CBasePin* pPin);

+	void AddInput();

+	UINT GetTrackNumber(CBasePin* pPin);

 

-    int GetPinCount();

-    CBasePin* GetPin(int n);

+	int GetPinCount();

+	CBasePin* GetPin(int n);

 

-    STDMETHODIMP Stop();

-    STDMETHODIMP Pause();

-    STDMETHODIMP Run(REFERENCE_TIME tStart);

+	STDMETHODIMP Stop();

+	STDMETHODIMP Pause();

+	STDMETHODIMP Run(REFERENCE_TIME tStart);

 

-    // IAMFilterMiscFlags

+	// IAMFilterMiscFlags

 

-    STDMETHODIMP_(ULONG) GetMiscFlags();

+	STDMETHODIMP_(ULONG) GetMiscFlags();

 

-    // IMediaSeeking

+	// IMediaSeeking

 

-    STDMETHODIMP GetCapabilities(DWORD* pCapabilities);

-    STDMETHODIMP CheckCapabilities(DWORD* pCapabilities);

-    STDMETHODIMP IsFormatSupported(const GUID* pFormat);

-    STDMETHODIMP QueryPreferredFormat(GUID* pFormat);

-    STDMETHODIMP GetTimeFormat(GUID* pFormat);

-    STDMETHODIMP IsUsingTimeFormat(const GUID* pFormat);

-    STDMETHODIMP SetTimeFormat(const GUID* pFormat);

-    STDMETHODIMP GetDuration(LONGLONG* pDuration);

-    STDMETHODIMP GetStopPosition(LONGLONG* pStop);

-    STDMETHODIMP GetCurrentPosition(LONGLONG* pCurrent);

-    STDMETHODIMP ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat);

-    STDMETHODIMP SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags);

-    STDMETHODIMP GetPositions(LONGLONG* pCurrent, LONGLONG* pStop);

-    STDMETHODIMP GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest);

-    STDMETHODIMP SetRate(double dRate);

-    STDMETHODIMP GetRate(double* pdRate);

-    STDMETHODIMP GetPreroll(LONGLONG* pllPreroll);

+	STDMETHODIMP GetCapabilities(DWORD* pCapabilities);

+	STDMETHODIMP CheckCapabilities(DWORD* pCapabilities);

+	STDMETHODIMP IsFormatSupported(const GUID* pFormat);

+	STDMETHODIMP QueryPreferredFormat(GUID* pFormat);

+	STDMETHODIMP GetTimeFormat(GUID* pFormat);

+	STDMETHODIMP IsUsingTimeFormat(const GUID* pFormat);

+	STDMETHODIMP SetTimeFormat(const GUID* pFormat);

+	STDMETHODIMP GetDuration(LONGLONG* pDuration);

+	STDMETHODIMP GetStopPosition(LONGLONG* pStop);

+	STDMETHODIMP GetCurrentPosition(LONGLONG* pCurrent);

+	STDMETHODIMP ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat);

+	STDMETHODIMP SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags);

+	STDMETHODIMP GetPositions(LONGLONG* pCurrent, LONGLONG* pStop);

+	STDMETHODIMP GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest);

+	STDMETHODIMP SetRate(double dRate);

+	STDMETHODIMP GetRate(double* pdRate);

+	STDMETHODIMP GetPreroll(LONGLONG* pllPreroll);

 

-    // IMatroskaMuxer

+	// IMatroskaMuxer

 

-    STDMETHODIMP CorrectTimeOffset(bool fNegative, bool fPositive);

+	STDMETHODIMP CorrectTimeOffset(bool fNegative, bool fPositive);

 };