indentation cosmetics, break a few long lines, keep a few one line blocks

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

5 files changed, 78 insertions, 76 deletions

diff --git a/src/filters/parser/BaseSplitter/AsyncReader.h b/src/filters/parser/BaseSplitter/AsyncReader.h
index 3bac9b034..86488b196 100644
--- a/src/filters/parser/BaseSplitter/AsyncReader.h
+++ b/src/filters/parser/BaseSplitter/AsyncReader.h
@@ -66,32 +66,18 @@ public:
     STDMETHODIMP WaitForNext(DWORD dwTimeout, IMediaSample** ppSample, DWORD_PTR* pdwUser) {

         return E_NOTIMPL;

     }

-    STDMETHODIMP SyncReadAligned(IMediaSample* pSample) {

-        return E_NOTIMPL;

-    }

+    STDMETHODIMP SyncReadAligned(IMediaSample* pSample) { return E_NOTIMPL; }

     STDMETHODIMP SyncRead(LONGLONG llPosition, LONG lLength, BYTE* pBuffer);

     STDMETHODIMP Length(LONGLONG* pTotal, LONGLONG* pAvailable);

-    STDMETHODIMP BeginFlush() {

-        return E_NOTIMPL;

-    }

-    STDMETHODIMP EndFlush() {

-        return E_NOTIMPL;

-    }

+    STDMETHODIMP BeginFlush() { return E_NOTIMPL; }

+    STDMETHODIMP EndFlush() { return E_NOTIMPL; }

 

     // ISyncReader

 

-    STDMETHODIMP_(void) SetBreakEvent(HANDLE hBreakEvent) {

-        m_hBreakEvent = hBreakEvent;

-    }

-    STDMETHODIMP_(bool) HasErrors() {

-        return m_lOsError != 0;

-    }

-    STDMETHODIMP_(void) ClearErrors() {

-        m_lOsError = 0;

-    }

-    STDMETHODIMP_(void) SetPTSOffset(REFERENCE_TIME* rtPTSOffset) {

-        m_pCurrentPTSOffset = rtPTSOffset;

-    };

+    STDMETHODIMP_(void) SetBreakEvent(HANDLE hBreakEvent) { m_hBreakEvent = hBreakEvent; }

+    STDMETHODIMP_(bool) HasErrors() { return m_lOsError != 0; }

+    STDMETHODIMP_(void) ClearErrors() { m_lOsError = 0; }

+    STDMETHODIMP_(void) SetPTSOffset(REFERENCE_TIME* rtPTSOffset) { m_pCurrentPTSOffset = rtPTSOffset; };

 

     // IFileHandle

 

diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h
index 7ef1e629a..11ce8a999 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.h
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.h
@@ -227,8 +227,10 @@ protected:
     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 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);

@@ -236,8 +238,14 @@ protected:
     STDMETHODIMP GetPreroll(LONGLONG* pllPreroll);

 

 public:

-    CBaseSplitterOutputPin(CAtlArray<CMediaType>& mts, LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr, int nBuffers = 0, int QueueMaxPackets = MAXPACKETS);

-    CBaseSplitterOutputPin(LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr, int nBuffers = 0, int QueueMaxPackets = MAXPACKETS);

+    CBaseSplitterOutputPin(CAtlArray<CMediaType>& mts, LPCWSTR pName,

+                           CBaseFilter* pFilter, CCritSec* pLock,

+                           HRESULT* phr, int nBuffers = 0,

+                           int QueueMaxPackets = MAXPACKETS);

+    CBaseSplitterOutputPin(LPCWSTR pName, CBaseFilter* pFilter,

+                           CCritSec* pLock, HRESULT* phr,

+                           int nBuffers = 0,

+                           int QueueMaxPackets = MAXPACKETS);

     virtual ~CBaseSplitterOutputPin();

 

     DECLARE_IUNKNOWN;

@@ -362,7 +370,8 @@ protected:
     virtual bool BuildChapters(LPCTSTR pszFileName, CAtlList<CHdmvClipInfo::PlaylistItem>& PlaylistItems, CAtlList<CHdmvClipInfo::PlaylistChapter>& Items) { return false; };

 

 public:

-    CBaseSplitterFilter(LPCTSTR pName, LPUNKNOWN pUnk, HRESULT* phr, const CLSID& clsid, int QueueMaxPackets = MAXPACKETS);

+    CBaseSplitterFilter(LPCTSTR pName, LPUNKNOWN pUnk, HRESULT* phr,

+                        const CLSID& clsid, int QueueMaxPackets = MAXPACKETS);

     virtual ~CBaseSplitterFilter();

 

     DECLARE_IUNKNOWN;

@@ -397,8 +406,10 @@ public:
     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 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);

@@ -407,7 +418,9 @@ public:
 

 protected:

     friend class CBaseSplitterOutputPin;

-    virtual HRESULT SetPositionsInternal(void* id, LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags);

+    virtual HRESULT SetPositionsInternal(void* id, LONGLONG* pCurrent,

+                                         DWORD dwCurrentFlags, LONGLONG* pStop,

+                                         DWORD dwStopFlags);

 

 private:

     REFERENCE_TIME m_rtLastStart, m_rtLastStop;

diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFile.h b/src/filters/parser/BaseSplitter/BaseSplitterFile.h
index 59cae090f..a0ed15366 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFile.h
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFile.h
@@ -45,7 +45,9 @@ protected:
     virtual void OnComplete() {}

 

 public:

-    CBaseSplitterFile(IAsyncReader* pReader, HRESULT& hr, int cachelen = DEFAULT_CACHE_LENGTH, bool fRandomAccess = true, bool fStreaming = false);

+    CBaseSplitterFile(IAsyncReader* pReader, HRESULT& hr,

+                      int cachelen = DEFAULT_CACHE_LENGTH,

+                      bool fRandomAccess = true, bool fStreaming = false);

     virtual ~CBaseSplitterFile() {}

 

     bool SetCacheSize(int cachelen = DEFAULT_CACHE_LENGTH);

diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h
index ba61b3cab..1c2cc5561 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h
@@ -26,27 +26,28 @@
 #include "BaseSplitterFile.h"

 #include "../../../DSUtil/Mpeg2Def.h"

 

-#define MAX_SPSPPS          256         // Max size for a SPS/PPS packet

+#define MAX_SPSPPS  256         // Max size for a SPS/PPS packet

+

 class CGolombBuffer;

 

 static const byte pixel_aspect[17][2] = {

-    {0, 1},

-    {1, 1},

-    {12, 11},

-    {10, 11},

-    {16, 11},

-    {40, 33},

-    {24, 11},

-    {20, 11},

-    {32, 11},

-    {80, 33},

-    {18, 11},

-    {15, 11},

-    {64, 33},

+    {0,    1},

+    {1,    1},

+    {12,  11},

+    {10,  11},

+    {16,  11},

+    {40,  33},

+    {24,  11},

+    {20,  11},

+    {32,  11},

+    {80,  33},

+    {18,  11},

+    {15,  11},

+    {64,  33},

     {160, 99},

-    {4, 3},

-    {3, 2},

-    {2, 1},

+    {4,    3},

+    {3,    2},

+    {2,    1},

 };

 

 class CBaseSplitterFileEx : public CBaseSplitterFile

diff --git a/src/filters/parser/BaseSplitter/MultiFiles.h b/src/filters/parser/BaseSplitter/MultiFiles.h
index 7f1ac0c42..d5b7dc4df 100644
--- a/src/filters/parser/BaseSplitter/MultiFiles.h
+++ b/src/filters/parser/BaseSplitter/MultiFiles.h
@@ -32,23 +32,23 @@ class CMultiFiles : public CObject
 public:

     // Flag values

     enum OpenFlags {

-        modeRead = (int) 0x00000,

-        modeWrite = (int) 0x00001,

-        modeReadWrite = (int) 0x00002,

-        shareCompat = (int) 0x00000,

-        shareExclusive = (int) 0x00010,

-        shareDenyWrite = (int) 0x00020,

-        shareDenyRead = (int) 0x00030,

-        shareDenyNone = (int) 0x00040,

-        modeNoInherit = (int) 0x00080,

-        modeCreate = (int) 0x01000,

-        modeNoTruncate = (int) 0x02000,

-        typeText = (int) 0x04000,         // typeText and typeBinary are

-        typeBinary = (int) 0x08000,       // used in derived classes only

-        osNoBuffer = (int) 0x10000,

-        osWriteThrough = (int) 0x20000,

-        osRandomAccess = (int) 0x40000,

-        osSequentialScan = (int) 0x80000,

+        modeRead         = (int)0x00000,

+        modeWrite        = (int)0x00001,

+        modeReadWrite    = (int)0x00002,

+        shareCompat      = (int)0x00000,

+        shareExclusive   = (int)0x00010,

+        shareDenyWrite   = (int)0x00020,

+        shareDenyRead    = (int)0x00030,

+        shareDenyNone    = (int)0x00040,

+        modeNoInherit    = (int)0x00080,

+        modeCreate       = (int)0x01000,

+        modeNoTruncate   = (int)0x02000,

+        typeText         = (int)0x04000,    // typeText and typeBinary are used in derived classes only

+        typeBinary       = (int)0x08000,

+        osNoBuffer       = (int)0x10000,

+        osWriteThrough   = (int)0x20000,

+        osRandomAccess   = (int)0x40000,

+        osSequentialScan = (int)0x80000,

     };

 

     enum Attribute {

@@ -66,7 +66,7 @@ public:
     // Constructors

     CMultiFiles();

 

-    CString         m_strFileName;

+    CString m_strFileName;

 

     // Operations

     virtual BOOL Open(LPCTSTR lpszFileName, UINT nOpenFlags);

@@ -84,16 +84,16 @@ public:
     virtual ~CMultiFiles();

 

 protected:

-    REFERENCE_TIME*             m_pCurrentPTSOffset;

-    CAtlArray<CString>          m_strFiles;

-    CAtlArray<ULONGLONG>        m_FilesSize;

-    CAtlArray<REFERENCE_TIME>   m_rtPtsOffsets;

-    HANDLE                      m_hFile;

-    int                         m_nCurPart;

-    ULONGLONG                   m_llTotalLength;

+    REFERENCE_TIME* m_pCurrentPTSOffset;

+    CAtlArray<CString> m_strFiles;

+    CAtlArray<ULONGLONG> m_FilesSize;

+    CAtlArray<REFERENCE_TIME> m_rtPtsOffsets;

+    HANDLE m_hFile;

+    int m_nCurPart;

+    ULONGLONG m_llTotalLength;

 

-    BOOL                        OpenPart(int nPart);

-    void                        ClosePart();

-    ULONGLONG                   GetAbsolutePosition(LONGLONG lOff, UINT nFrom);

-    void                        Reset();

+    BOOL OpenPart(int nPart);

+    void ClosePart();

+    ULONGLONG GetAbsolutePosition(LONGLONG lOff, UINT nFrom);

+    void Reset();

 };