indentation cosmetics

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

1 files changed, 64 insertions, 64 deletions

diff --git a/src/DSUtil/HdmvClipInfo.h b/src/DSUtil/HdmvClipInfo.h
index b5ff57cb1..ef31848e3 100644
--- a/src/DSUtil/HdmvClipInfo.h
+++ b/src/DSUtil/HdmvClipInfo.h
@@ -26,47 +26,47 @@
 

 enum BDVM_VideoFormat {

     BDVM_VideoFormat_Unknown = 0,

-    BDVM_VideoFormat_480i = 1,

-    BDVM_VideoFormat_576i = 2,

-    BDVM_VideoFormat_480p = 3,

-    BDVM_VideoFormat_1080i = 4,

-    BDVM_VideoFormat_720p = 5,

-    BDVM_VideoFormat_1080p = 6,

-    BDVM_VideoFormat_576p = 7,

+    BDVM_VideoFormat_480i    = 1,

+    BDVM_VideoFormat_576i    = 2,

+    BDVM_VideoFormat_480p    = 3,

+    BDVM_VideoFormat_1080i   = 4,

+    BDVM_VideoFormat_720p    = 5,

+    BDVM_VideoFormat_1080p   = 6,

+    BDVM_VideoFormat_576p    = 7,

 };

 

 enum BDVM_FrameRate {

     BDVM_FrameRate_Unknown = 0,

-    BDVM_FrameRate_23_976 = 1,

-    BDVM_FrameRate_24 = 2,

-    BDVM_FrameRate_25 = 3,

-    BDVM_FrameRate_29_97 = 4,

-    BDVM_FrameRate_50 = 6,

-    BDVM_FrameRate_59_94 = 7

+    BDVM_FrameRate_23_976  = 1,

+    BDVM_FrameRate_24      = 2,

+    BDVM_FrameRate_25      = 3,

+    BDVM_FrameRate_29_97   = 4,

+    BDVM_FrameRate_50      = 6,

+    BDVM_FrameRate_59_94   = 7

 };

 

 enum BDVM_AspectRatio {

     BDVM_AspectRatio_Unknown = 0,

-    BDVM_AspectRatio_4_3 = 2,

-    BDVM_AspectRatio_16_9 = 3,

-    BDVM_AspectRatio_2_21 = 4

+    BDVM_AspectRatio_4_3     = 2,

+    BDVM_AspectRatio_16_9    = 3,

+    BDVM_AspectRatio_2_21    = 4

 };

 

 enum BDVM_ChannelLayout {

     BDVM_ChannelLayout_Unknown = 0,

-    BDVM_ChannelLayout_MONO = 1,

-    BDVM_ChannelLayout_STEREO = 3,

-    BDVM_ChannelLayout_MULTI = 6,

-    BDVM_ChannelLayout_COMBO = 12

+    BDVM_ChannelLayout_MONO    = 1,

+    BDVM_ChannelLayout_STEREO  = 3,

+    BDVM_ChannelLayout_MULTI   = 6,

+    BDVM_ChannelLayout_COMBO   = 12

 };

 

 enum BDVM_SampleRate {

     BDVM_SampleRate_Unknown = 0,

-    BDVM_SampleRate_48 = 1,

-    BDVM_SampleRate_96 = 4,

-    BDVM_SampleRate_192 = 5,

-    BDVM_SampleRate_48_192 = 12,

-    BDVM_SampleRate_48_96 = 14

+    BDVM_SampleRate_48      = 1,

+    BDVM_SampleRate_96      = 4,

+    BDVM_SampleRate_192     = 5,

+    BDVM_SampleRate_48_192  = 12,

+    BDVM_SampleRate_48_96   = 14

 };

 

 class CHdmvClipInfo

@@ -77,26 +77,26 @@ public:
         Stream() {

             memset(this, 0, sizeof(*this));

         }

-        SHORT                   m_PID;

-        PES_STREAM_TYPE         m_Type;

-        char                    m_LanguageCode[4];

-        LCID                    m_LCID;

+        SHORT m_PID;

+        PES_STREAM_TYPE m_Type;

+        char m_LanguageCode[4];

+        LCID m_LCID;

 

         // Valid for video types

-        BDVM_VideoFormat        m_VideoFormat;

-        BDVM_FrameRate          m_FrameRate;

-        BDVM_AspectRatio        m_AspectRatio;

+        BDVM_VideoFormat m_VideoFormat;

+        BDVM_FrameRate m_FrameRate;

+        BDVM_AspectRatio m_AspectRatio;

         // Valid for audio types

-        BDVM_ChannelLayout      m_ChannelLayout;

-        BDVM_SampleRate         m_SampleRate;

+        BDVM_ChannelLayout m_ChannelLayout;

+        BDVM_SampleRate m_SampleRate;

 

         LPCTSTR Format();

     };

 

     struct PlaylistItem {

-        CString                 m_strFileName;

-        REFERENCE_TIME          m_rtIn;

-        REFERENCE_TIME          m_rtOut;

+        CString m_strFileName;

+        REFERENCE_TIME m_rtIn;

+        REFERENCE_TIME m_rtOut;

 

         REFERENCE_TIME Duration() const { return m_rtOut - m_rtIn; }

 

@@ -106,46 +106,46 @@ public:
     };

 

     enum PlaylistMarkType {

-        Reserved            = 0x00,

-        EntryMark           = 0x01,

-        LinkPoint           = 0x02

+        Reserved  = 0x00,

+        EntryMark = 0x01,

+        LinkPoint = 0x02

     };

 

     struct PlaylistChapter {

-        SHORT               m_nPlayItemId;

-        PlaylistMarkType    m_nMarkType;

-        REFERENCE_TIME      m_rtTimestamp;

-        SHORT               m_nEntryPID;

-        REFERENCE_TIME      m_rtDuration;

+        SHORT            m_nPlayItemId;

+        PlaylistMarkType m_nMarkType;

+        REFERENCE_TIME   m_rtTimestamp;

+        SHORT            m_nEntryPID;

+        REFERENCE_TIME   m_rtDuration;

     };

 

     CHdmvClipInfo(void);

     ~CHdmvClipInfo();

 

-    HRESULT     ReadInfo(LPCTSTR strFile);

-    Stream*     FindStream(SHORT wPID);

-    bool        IsHdmv() const { return m_bIsHdmv; };

-    size_t      GetStreamNumber() { return m_Streams.GetCount(); };

-    Stream*     GetStreamByIndex(size_t nIndex) { return (nIndex < m_Streams.GetCount()) ? &m_Streams[nIndex] : NULL; };

+    HRESULT ReadInfo(LPCTSTR strFile);

+    Stream* FindStream(SHORT wPID);

+    bool IsHdmv() const { return m_bIsHdmv; };

+    size_t GetStreamNumber() { return m_Streams.GetCount(); };

+    Stream* GetStreamByIndex(size_t nIndex) { return (nIndex < m_Streams.GetCount()) ? &m_Streams[nIndex] : NULL; };

 

-    HRESULT     FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile, CAtlList<PlaylistItem>& MainPlaylist, CAtlList<PlaylistItem>& MPLSPlaylists);

-    HRESULT     ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtDuration, CAtlList<PlaylistItem>& Playlist);

-    HRESULT     ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipInfo::PlaylistItem>& PlaylistItems, CAtlList<PlaylistChapter>& Chapters);

+    HRESULT FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile, CAtlList<PlaylistItem>& MainPlaylist, CAtlList<PlaylistItem>& MPLSPlaylists);

+    HRESULT ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtDuration, CAtlList<PlaylistItem>& Playlist);

+    HRESULT ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipInfo::PlaylistItem>& PlaylistItems, CAtlList<PlaylistChapter>& Chapters);

 

 private :

-    DWORD       SequenceInfo_start_address;

-    DWORD       ProgramInfo_start_address;

+    DWORD SequenceInfo_start_address;

+    DWORD ProgramInfo_start_address;

 

-    HANDLE      m_hFile;

+    HANDLE m_hFile;

 

-    CAtlArray<Stream>   m_Streams;

-    bool                m_bIsHdmv;

+    CAtlArray<Stream> m_Streams;

+    bool m_bIsHdmv;

 

-    DWORD       ReadDword();

-    SHORT       ReadShort();

-    BYTE        ReadByte();

-    void        ReadBuffer(BYTE* pBuff, DWORD nLen);

+    DWORD ReadDword();

+    SHORT ReadShort();

+    BYTE ReadByte();

+    void ReadBuffer(BYTE* pBuff, DWORD nLen);

 

-    HRESULT     ReadProgramInfo();

-    HRESULT     CloseFile(HRESULT hr);

+    HRESULT ReadProgramInfo();

+    HRESULT CloseFile(HRESULT hr);

 };