From: Moritz Bunkus Date: Sat, 24 Sep 2022 19:27:21 +0000 (+0200) Subject: cosmetics: restore alignment/indentation X-Git-Tag: release-1.7.0~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4efe3380ecddfd1f8da31dc680c0b6673f8a5223;p=libmatroska cosmetics: restore alignment/indentation --- diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h index c48c082..bc56d4a 100644 --- a/matroska/KaxBlock.h +++ b/matroska/KaxBlock.h @@ -54,9 +54,9 @@ class KaxBlockBlob; class MATROSKA_DLL_API DataBuffer { protected: - binary *myBuffer{nullptr}; + binary *myBuffer{nullptr}; uint32 mySize; - bool bValidValue{true}; + bool bValidValue{true}; bool (*myFreeBuffer)(const DataBuffer & aBuffer); // method to free the internal buffer bool bInternalBuffer; @@ -273,20 +273,20 @@ class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary { protected: std::vector myBuffers; std::vector SizeList; - uint64 Timecode; // temporary timecode of the first frame, non scaled - int16 LocalTimecode; - bool bLocalTimecodeUsed{false}; - uint16 TrackNumber; - LacingType mLacing{LACING_AUTO}; - bool mInvisible{false}; - uint64 FirstFrameLocation; + uint64 Timecode; // temporary timecode of the first frame, non scaled + int16 LocalTimecode; + bool bLocalTimecodeUsed{false}; + uint16 TrackNumber; + LacingType mLacing{LACING_AUTO}; + bool mInvisible{false}; + uint64 FirstFrameLocation; + + KaxCluster *ParentCluster{nullptr}; + bool bIsSimple; + bool bIsKeyframe{true}; + bool bIsDiscardable{false}; filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault = false) override; - - KaxCluster *ParentCluster{nullptr}; - bool bIsSimple; - bool bIsKeyframe{true}; - bool bIsDiscardable{false}; }; DECLARE_MKX_CONTEXT(KaxBlock) @@ -364,9 +364,9 @@ DECLARE_MKX_BINARY_CONS(KaxBlockVirtual) void SetParent(const KaxCluster & aParentCluster) {ParentCluster = &aParentCluster;} - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; + filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override; - filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override; + filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) override; protected: uint64 Timecode; // temporary timecode of the first frame if there are more than one diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h index 3149b57..eb89d88 100644 --- a/matroska/KaxCluster.h +++ b/matroska/KaxCluster.h @@ -143,10 +143,10 @@ DECLARE_MKX_MASTER_CONS(KaxCluster) uint64 MinTimecode, MaxTimecode, PreviousTimecode; int64 TimecodeScale; - bool bFirstFrameInside{false}; // used to speed research - bool bPreviousTimecodeIsSet{false}; - bool bTimecodeScaleIsSet{false}; - bool bSilentTracksUsed{false}; + bool bFirstFrameInside{false}; // used to speed research + bool bPreviousTimecodeIsSet{false}; + bool bTimecodeScaleIsSet{false}; + bool bSilentTracksUsed{false}; /*! \note method used internally