indentation cosmetics

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

3 files changed, 22 insertions, 28 deletions

diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h
index f4fc8d0db..5a9caef3d 100644
--- a/src/DSUtil/DSUtil.h
+++ b/src/DSUtil/DSUtil.h
@@ -225,9 +225,9 @@ static CUnknown* WINAPI CreateInstance(LPUNKNOWN lpunk, HRESULT* phr)
 	return punk;

 }

 

-#define SAFE_DELETE(p)       { if (p) { delete (p);     (p)=NULL; } }

-#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p);   (p)=NULL; } }

-#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p)=NULL; } }

+#define SAFE_DELETE(p)       { if (p) { delete (p);     (p) = NULL; } }

+#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p);   (p) = NULL; } }

+#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p) = NULL; } }

 

 inline int LNKO(int a, int b)

 {

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h
index e70620f53..a7f9d5082 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.h
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.h
@@ -32,16 +32,16 @@
 #define MpegSourceName   L"MPC MPEG Source"

 

 

-#define PauseGraph                                                              \

-    CComQIPtr<IMediaControl> _pMC(m_pGraph);                                    \

-    OAFilterState _fs = -1;                                                     \

-    if (_pMC) _pMC->GetState(1000, &_fs);                                       \

-    if (_fs == State_Running)                                                   \

-        _pMC->Pause();                                                          \

-                                                                                \

-    HRESULT _hr = E_FAIL;                                                       \

-    CComQIPtr<IMediaSeeking> _pMS((IUnknown*)(INonDelegatingUnknown*)m_pGraph); \

-    LONGLONG _rtNow = 0;                                                        \

+#define PauseGraph                                                                                         \

+    CComQIPtr<IMediaControl> _pMC(m_pGraph);                                                               \

+    OAFilterState _fs = -1;                                                                                \

+    if (_pMC) _pMC->GetState(1000, &_fs);                                                                  \

+    if (_fs == State_Running)                                                                              \

+        _pMC->Pause();                                                                                     \

+                                                                                                           \

+    HRESULT _hr = E_FAIL;                                                                                  \

+    CComQIPtr<IMediaSeeking> _pMS((IUnknown*)(INonDelegatingUnknown*)m_pGraph);                            \

+    LONGLONG _rtNow = 0;                                                                                   \

     if (_pMS) _hr = _pMS->GetCurrentPosition(&_rtNow);

 

 #define ResumeGraph                                                                                        \

@@ -88,9 +88,7 @@ private:
 

 public:

 	CMpegSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr, const CLSID& clsid = __uuidof(CMpegSplitterFilter));

-	void SetPipo(bool bPipo) {

-		m_pPipoBimbo = bPipo;

-	};

+	void SetPipo(bool bPipo) { m_pPipoBimbo = bPipo; };

 

 	bool StreamIsTrueHD(const WORD pid);

 

@@ -170,8 +168,6 @@ protected:
 public:

 	CMpegSplitterOutputPin(CAtlArray<CMediaType>& mts, LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr, int type);

 	virtual ~CMpegSplitterOutputPin();

-	STDMETHODIMP	Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt);

-	void			SetMaxShift(REFERENCE_TIME rtMaxShift) {

-		m_rtMaxShift = rtMaxShift;

-	};

+	STDMETHODIMP    Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt);

+	void            SetMaxShift(REFERENCE_TIME rtMaxShift) { m_rtMaxShift = rtMaxShift; };

 };

diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.h b/src/filters/parser/MpegSplitter/MpegSplitterFile.h
index 2838273c1..c5f00887c 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitterFile.h
+++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.h
@@ -28,8 +28,8 @@
 #include "../BaseSplitter/BaseSplitter.h"

 #include "../../../DSUtil/GolombBuffer.h"

 

-#define NO_SUBTITLE_PID			1		// Fake PID use for the "No subtitle" entry

-#define NO_SUBTITLE_NAME		_T("No subtitle")

+#define NO_SUBTITLE_PID     1          // Fake PID use for the "No subtitle" entry

+#define NO_SUBTITLE_NAME    _T("No subtitle")

 

 #define ISVALIDPID(pid) (pid >= 0x10 && pid < 0x1fff)

 

@@ -155,15 +155,13 @@ public:
 	DWORD AddStream(WORD pid, BYTE pesid, BYTE ps1id, DWORD len);

 	void  AddHdmvPGStream(WORD pid, const char* language_code);

 	CAtlList<stream>* GetMasterStream();

-	bool IsHdmv() {

-		return m_bIsHdmv;

-	};

+	bool IsHdmv() { return m_bIsHdmv; };

 

 	struct program {

-		WORD					program_number;

+		WORD                program_number;

 		struct stream {

-			WORD				pid;

-			PES_STREAM_TYPE		type;

+			WORD            pid;

+			PES_STREAM_TYPE type;

 

 		};

 		stream streams[64];