diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-06 20:24:24 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-11 01:28:41 +0200 |
| commit | 502ee050855da2af9e73c6be8aa2f6f2d73c52f9 (patch) | |
| tree | d2da130f742b9cf9e8f9bd129e50bebaa8dff425 /src | |
| parent | 656e22f15d25fbdfd071047c87493a5a148eda6c (diff) | |
Fix initialisation order of constructors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/AS_02_PHDR.cpp | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_internal.h | 2 | ||||
| -rwxr-xr-x | src/KM_util.cpp | 2 | ||||
| -rwxr-xr-x | src/MXF.cpp | 6 | ||||
| -rw-r--r-- | src/h__02_Reader.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp index 471d226..6876e5b 100644 --- a/src/AS_02_PHDR.cpp +++ b/src/AS_02_PHDR.cpp @@ -355,7 +355,7 @@ public: byte_t m_EssenceUL[SMPTE_UL_LENGTH]; byte_t m_MetadataUL[SMPTE_UL_LENGTH]; - h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) { + h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_MetadataTrackSubDescriptor(0), m_EssenceSubDescriptor(0) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); memset(m_MetadataUL, 0, SMPTE_UL_LENGTH); } diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 045e78f..ad21170 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -226,7 +226,7 @@ namespace ASDCP Kumu::fpos_t m_LastPosition; TrackFileReader(const Dictionary& d) : - m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict), m_Dict(&d) + m_Dict(&d), m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict) { default_md_object_init(); } diff --git a/src/KM_util.cpp b/src/KM_util.cpp index d263d6e..da8d732 100755 --- a/src/KM_util.cpp +++ b/src/KM_util.cpp @@ -129,7 +129,7 @@ Kumu::Result_t::Get(unsigned int i) } // -Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), symbol(s), label(l) +Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), label(l), symbol(s) { assert(!l.empty()); assert(!s.empty()); diff --git a/src/MXF.cpp b/src/MXF.cpp index 5cab95e..1bf16ed 100755 --- a/src/MXF.cpp +++ b/src/MXF.cpp @@ -1026,8 +1026,8 @@ ASDCP::MXF::OP1aHeader::Dump(FILE* stream) // ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter(const Dictionary*& d) : - Partition(d), m_Dict(d), - m_CurrentSegment(0), m_BytesPerEditUnit(0), m_BodySID(0), + Partition(d), m_CurrentSegment(0), m_BytesPerEditUnit(0), + m_BodySID(0), m_Dict(d), m_ECOffset(0), m_Lookup(0) { BodySID = 0; @@ -1769,7 +1769,7 @@ ASDCP::MXF::decode_mca_string(const std::string& s, const mca_label_map_t& label } // -ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_Dict(d), m_ChannelCount(0) +ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_ChannelCount(0), m_Dict(d) { typedef mca_label_map_t::value_type pair; m_LabelMap.insert(pair("L", label_traits("Left" , true, m_Dict->ul(MDD_DCAudioChannel_L)))); diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp index b3c092b..e807387 100644 --- a/src/h__02_Reader.cpp +++ b/src/h__02_Reader.cpp @@ -64,8 +64,8 @@ AS_02::default_md_object_init() AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary*& d) : - m_Duration(0), m_BytesPerEditUnit(0), - ASDCP::MXF::Partition(d), m_Dict(d) {} + ASDCP::MXF::Partition(d), + m_Duration(0), m_BytesPerEditUnit(0), m_Dict(d) {} AS_02::MXF::AS02IndexReader::~AS02IndexReader() {} |