Fix constructor initializer order.

diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp
index 1ecd8880aeb70739ccae049a470d9bebfe122d0a..098e68d2035c4ab1c43cb6c6c83bbb48abfc80eb 100644 (file)
--- a/src/AS_02_PHDR.cpp
+++ b/src/AS_02_PHDR.cpp
@@ -24,7 +24,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/ 
+*/
 /*! \file    AS_02_PHDR.cpp
   \version $Id$
   \brief   AS-02 library, JPEG 2000 P-HDR essence reader and writer implementation
@@ -146,7 +146,7 @@ AS_02::PHDR::MXFReader::h__Reader::OpenRead(const std::string& filename, std::st
     {
       RIP::const_pair_iterator pi;
       RIP::PartitionPair TmpPair;
-      
+
       // Look up the partition start in the RIP using the SID.
       for ( pi = m_RIP.PairArray.begin(); pi != m_RIP.PairArray.end(); ++pi )
        {
@@ -356,7 +356,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);
   }
@@ -444,9 +444,9 @@ AS_02::PHDR::MXFWriter::h__Writer::WritePHDRHeader(const std::string& PackageLab
       DefaultLogSink().Error("Non-zero edit-rate reqired.\n");
       return RESULT_PARAM;
     }
-  
+
   InitHeader();
-  
+
   AddSourceClip(EditRate, EditRate/*TODO: for a moment*/, TCFrameRate, TrackName, EssenceUL, DataDefinition, PackageLabel);
 
   // add metadata track
@@ -469,7 +469,7 @@ AS_02::PHDR::MXFWriter::h__Writer::WritePHDRHeader(const std::string& PackageLab
   // for now we do not allow setting this value, so all files will be 'original'
   metdata_track.Clip->SourceTrackID = 0;
   metdata_track.Clip->SourcePackageID = NilUMID;
-  
+
   metdata_track.Clip->Duration.set_has_value();
   m_DurationUpdateList.push_back(&(metdata_track.Clip->Duration.get()));
 
@@ -571,20 +571,20 @@ AS_02::PHDR::MXFWriter::h__Writer::WriteFrame(const AS_02::PHDR::FrameBuffer& Fr
 
       result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
                                 m_StreamOffset, FrameBuf, m_EssenceUL, Ctx, HMAC);
-      
+
       if ( KM_SUCCESS(result) )
        {
          ASDCP::FrameBuffer metadata_buffer_wrapper;
          metadata_buffer_wrapper.SetData((byte_t*)(FrameBuf.OpaqueMetadata.c_str()), FrameBuf.OpaqueMetadata.size());
          metadata_buffer_wrapper.Size(FrameBuf.OpaqueMetadata.size());
-         
-         
+
+
          result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
                                     m_StreamOffset, metadata_buffer_wrapper, m_MetadataUL, Ctx, HMAC);
        }
-      
+
       if ( KM_SUCCESS(result) )
-       {  
+       {
          IndexTableSegment::IndexEntry Entry;
          Entry.StreamOffset = this_stream_offset;
          m_IndexWriter.PushIndexEntry(Entry);
@@ -751,7 +751,7 @@ AS_02::PHDR::MXFWriter::OpenWrite(const std::string& filename, const ASDCP::Writ
 // argument is present, the essence is encrypted prior to writing.
 // Fails if the file is not open, is finalized, or an operating system
 // error occurs.
-Result_t 
+Result_t
 AS_02::PHDR::MXFWriter::WriteFrame(const AS_02::PHDR::FrameBuffer& FrameBuf, AESEncContext* Ctx, HMACContext* HMAC)
 {
   if ( m_Writer.empty() )

diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index c1df8aded6b09910a19ea989fe31a4618d717d34..e98aac8a140eedac1a79e44026d715db2e76685e 100755 (executable)
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -200,7 +200,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 d263d6e47bcfd416b30ddf71a164a594a78890cf..da8d7327c0b3ea60b681580dfa095c61aa8e6bce 100755 (executable)
--- 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 258bdbf75a9b029999c3e375eef7d2624ae46fed..bd3c12dba6654687f5026f58b8e40b130c7bfa76 100755 (executable)
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -983,8 +983,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;
@@ -1648,7 +1648,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/PCMDataProviders.cpp b/src/PCMDataProviders.cpp
index 7d2c1524b934085b74cf90f5521c0c86f7a6558c..8eb968101dcfaa467d019079fe66ec360cdc4500 100644 (file)
--- a/src/PCMDataProviders.cpp
+++ b/src/PCMDataProviders.cpp
@@ -40,7 +40,7 @@ ASDCP::PCMDataProviderInterface::~PCMDataProviderInterface() {}
 
 //
 ASDCP::WAVDataProvider::WAVDataProvider()
-    : m_Parser(), m_FB(), m_ADesc(), m_SampleSize(0), m_ptr(NULL)
+    : m_Parser(), m_FB(), m_ADesc(), m_ptr(NULL), m_SampleSize(0)
 {}
 
 ASDCP::WAVDataProvider::~WAVDataProvider()

diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp
index 7d730d47ba7549e2fecdfa75d6215ec80453af1a..4596ca71be01abe311e9dbb7b5835b3084779468 100755 (executable)
--- a/src/asdcp-wrap.cpp
+++ b/src/asdcp-wrap.cpp
@@ -291,19 +291,20 @@ public:
 
   //
   CommandOptions(int argc, const char** argv) :
-    error_flag(true), key_flag(false), key_id_flag(false), asset_id_flag(false),
+    error_flag(true), key_flag(false), asset_id_flag(false),
     encrypt_header_flag(true), write_hmac(true),
     verbose_flag(false), fb_dump_size(0),
     no_write_flag(false), version_flag(false), help_flag(false), stereo_image_flag(false),
     write_partial_pcm_flag(false), start_frame(0),
     duration(0xffffffff), use_smpte_labels(false), j2c_pedantic(true),
     fb_size(FRAME_BUFFER_SIZE),
+    key_id_flag(false),
     channel_fmt(PCM::CF_NONE),
-    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
-    dolby_atmos_sync_flag(false),
     show_ul_values_flag(false),
-    mca_config(g_dict),
-    use_interop_sound_wtf(false)
+    dolby_atmos_sync_flag(false),
+    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
+    use_interop_sound_wtf(false),
+    mca_config(g_dict)
   {
     memset(key_value, 0, KeyLen);
     memset(key_id_value, 0, UUIDlen);

diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp
index a81d1aecf58cc1a0f47c8a259e4f99451f4f954b..b812c5abbd483f51d3aae2dc5a71259a478ffc98 100644 (file)
--- a/src/h__02_Reader.cpp
+++ b/src/h__02_Reader.cpp
@@ -25,7 +25,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/ 
+*/
 /*! \file    h__02_Reader.cpp
   \version $Id$
   \brief   MXF file reader base class
@@ -62,14 +62,14 @@ 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() {}
 
-//    
+//
 Result_t
 AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const ASDCP::MXF::RIP& rip, const bool has_header_essence)
 {
@@ -198,7 +198,7 @@ AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const
   if ( KM_SUCCESS(result) )
     {
       std::list<InterchangeObject*>::const_iterator ii;
-  
+
       for ( ii = m_PacketList->m_List.begin(); ii != m_PacketList->m_List.end(); ++ii )
        {
          IndexTableSegment *segment = dynamic_cast<IndexTableSegment*>(*ii);