apply the new astyle command; use 4 spaces for indentation and k&r style

Note: if you have any local patches just run astyle.bat

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

1 files changed, 81 insertions, 81 deletions

diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h
index 532157827..5dcf9d4d2 100644
--- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h
+++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h
@@ -34,130 +34,130 @@
 

 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;

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

+    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 CheckMediaType(const CMediaType* pmt);

+    HRESULT BreakConnect();

+    HRESULT CompleteConnect(IPin* pPin);

+    HRESULT Active(), Inactive();

 

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

-	STDMETHODIMP BeginFlush();

-	STDMETHODIMP EndFlush();

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

+    STDMETHODIMP BeginFlush();

+    STDMETHODIMP EndFlush();

 

-	STDMETHODIMP Receive(IMediaSample* pSample);

-	STDMETHODIMP EndOfStream();

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

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

+    DECLARE_IUNKNOWN;

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

 

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

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

 

-	HRESULT CheckMediaType(const CMediaType* pmt);

-	HRESULT GetMediaType(int iPosition, CMediaType* pmt);

+    HRESULT CheckMediaType(const CMediaType* pmt);

+    HRESULT GetMediaType(int iPosition, CMediaType* pmt);

 

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

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

 };

 

 interface __declspec(uuid("38E2D43D-915D-493C-B373-888DB16EE3DC"))

 IMatroskaMuxer :

 public IUnknown {

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

-	// TODO: chapters

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

+    // TODO: chapters

 };

 

 class __declspec(uuid("1E1299A2-9D42-4F12-8791-D79E376F4143"))

-	CMatroskaMuxerFilter

-	: public CBaseFilter

-	, public CCritSec

-	, public CAMThread

-	, public IAMFilterMiscFlags

-	, public IMediaSeeking

-	, public IMatroskaMuxer

+    CMatroskaMuxerFilter

+    : 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;

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

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

 };