White space; warning fixes.

8 files changed, 54 insertions, 49 deletions

diff --git a/asdcplib/src/AS_02_PCM.cpp b/asdcplib/src/AS_02_PCM.cpp
index ec609008..2336db21 100644
--- a/asdcplib/src/AS_02_PCM.cpp
+++ b/asdcplib/src/AS_02_PCM.cpp
@@ -28,7 +28,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /*! \file    AS_02_PCM.cpp
-  \version $Id: AS_02_PCM.cpp,v 1.16 2015/10/07 16:41:23 jhurst Exp $       
+  \version $Id: AS_02_PCM.cpp,v 1.16 2015/10/07 16:41:23 jhurst Exp $
   \brief   AS-02 library, PCM essence reader and writer implementation
 */
 
@@ -117,7 +117,7 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS
 		{
 		  DefaultLogSink().Error("Essence wrapper key is not WAVEssenceClip: %s\n", entry->name);
 		}
-	      
+
 	      return RESULT_AS02_FORMAT;
 	    }
 
@@ -151,7 +151,7 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS
 //
 ASDCP::Result_t
 AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBuffer& FrameBuf,
-					    ASDCP::AESDecContext* Ctx, ASDCP::HMACContext* HMAC)
+					    ASDCP::AESDecContext*, ASDCP::HMACContext*)
 {
   if ( ! m_File.IsOpen() )
     {
@@ -165,7 +165,7 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu
 
   assert(m_ClipEssenceBegin);
   ui64_t offset = FrameNum * m_BytesPerFrame;
-  ui64_t position = m_ClipEssenceBegin + offset;
+  Kumu::fpos_t position = m_ClipEssenceBegin + offset;
   Result_t result = RESULT_OK;
 
   if ( m_File.Tell() != position )
@@ -332,7 +332,7 @@ public:
   ASDCP::MXF::WaveAudioDescriptor *m_WaveAudioDescriptor;
   byte_t m_EssenceUL[SMPTE_UL_LENGTH];
   ui32_t m_BytesPerSample;
-  
+
   h__Writer(const Dictionary& d) : AS_02::h__AS02WriterClip(d), m_WaveAudioDescriptor(0), m_BytesPerSample(0)
   {
     memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
@@ -597,4 +597,3 @@ AS_02::PCM::MXFWriter::Finalize()
 //
 // end AS_02_PCM.cpp
 //
-
diff --git a/asdcplib/src/AS_02_PHDR.cpp b/asdcplib/src/AS_02_PHDR.cpp
index 4dbbb21c..09cea222 100644
--- a/asdcplib/src/AS_02_PHDR.cpp
+++ b/asdcplib/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: AS_02_PHDR.cpp,v 1.7 2015/10/09 23:41:11 jhurst Exp $
   \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/asdcplib/src/AS_02_internal.h b/asdcplib/src/AS_02_internal.h
index bcee7a7b..fa8efde5 100644
--- a/asdcplib/src/AS_02_internal.h
+++ b/asdcplib/src/AS_02_internal.h
@@ -25,9 +25,9 @@ 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_internal.h
-  \version $Id: AS_02_internal.h ***       
+  \version $Id: AS_02_internal.h ***
   \brief   AS-02 library, non-public common elements
 */
 
@@ -92,7 +92,7 @@ namespace AS_02
       public:
 	const ASDCP::Dictionary*&  m_Dict;
 	ASDCP::IPrimerLookup*      m_Lookup;
-      
+
 	AS02IndexWriterVBR(const ASDCP::Dictionary*&);
 	virtual ~AS02IndexWriterVBR();
 
@@ -124,7 +124,7 @@ namespace AS_02
 	ASDCP::IPrimerLookup* m_Lookup;
 	ui32_t m_Duration;
 	ui32_t m_SampleSize;
-      
+
 	AS02IndexWriterCBR(const ASDCP::Dictionary*&);
 	virtual ~AS02IndexWriterCBR();
 
@@ -159,7 +159,7 @@ namespace AS_02
       ~h__AS02Writer() {}
 
 
-      
+
       // all the above for a single source clip
       Result_t WriteAS02Header(const std::string& PackageLabel, const ASDCP::UL& WrappingUL,
 			       const std::string& TrackName, const ASDCP::UL& EssenceUL,
@@ -244,14 +244,13 @@ namespace AS_02
 
 	if ( KM_SUCCESS(result) )
 	  result = this->m_File.Seek(0);
-	
+
 	if ( KM_SUCCESS(result) )
 	  result = m_HeaderPart.WriteToFile(this->m_File, this->m_HeaderSize);
-  
+
 	if ( KM_SUCCESS(result) )
 	  {
 	    ASDCP::MXF::RIP::const_pair_iterator i = this->m_RIP.PairArray.begin();
-	    ui64_t header_byte_count = this->m_HeaderPart.HeaderByteCount;
 	    ui64_t previous_partition = 0;
 
 	    for ( i = this->m_RIP.PairArray.begin(); KM_SUCCESS(result) && i != this->m_RIP.PairArray.end(); ++i )
@@ -261,7 +260,7 @@ namespace AS_02
 
 		if ( KM_SUCCESS(result) )
 		  result = plain_part.InitFromFile(this->m_File);
-		
+
 		if ( KM_SUCCESS(result)
 		     && ( plain_part.IndexSID > 0 || plain_part.BodySID > 0 ) )
 		  {
@@ -278,7 +277,7 @@ namespace AS_02
 		  }
 	      }
 	  }
-	
+
 	this->m_File.Close();
 	return result;
       }
diff --git a/asdcplib/src/AS_DCP_TimedText.cpp b/asdcplib/src/AS_DCP_TimedText.cpp
index 10651a84..1a9ff56d 100644
--- a/asdcplib/src/AS_DCP_TimedText.cpp
+++ b/asdcplib/src/AS_DCP_TimedText.cpp
@@ -25,7 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /*! \file    AS_DCP_TimedText.cpp
-    \version $Id: AS_DCP_TimedText.cpp,v 1.38 2015/10/09 23:41:11 jhurst Exp $       
+    \version $Id: AS_DCP_TimedText.cpp,v 1.38 2015/10/09 23:41:11 jhurst Exp $
     \brief   AS-DCP library, PCM essence reader and writer implementation
 */
 
@@ -43,6 +43,7 @@ static std::string TIMED_TEXT_DEF_LABEL = "Timed Text Track";
 
 //------------------------------------------------------------------------------------------
 
+static
 const char*
 MIME2str(TimedText::MIMEType_t m)
 {
@@ -99,7 +100,7 @@ ASDCP::TimedText::DescriptorDump(ASDCP::TimedText::TimedTextDescriptor const& TD
     {
       TmpID.Set((*ri).ResourceID);
       fprintf(stream, "    %s: %s\n",
-	      TmpID.EncodeHex(buf, 64), 
+	      TmpID.EncodeHex(buf, 64),
 	      MIME2str((*ri).Type));
     }
 }
@@ -131,7 +132,7 @@ class ASDCP::TimedText::MXFReader::h__Reader : public ASDCP::h__ASDCPReader
   ASDCP_NO_COPY_CONSTRUCT(h__Reader);
 
 public:
-  TimedTextDescriptor m_TDesc;    
+  TimedTextDescriptor m_TDesc;
 
   h__Reader(const Dictionary& d) : ASDCP::h__ASDCPReader(d), m_EssenceDescriptor(0) {
     memset(&m_TDesc.AssetID, 0, UUIDlen);
@@ -204,7 +205,7 @@ ASDCP::Result_t
 ASDCP::TimedText::MXFReader::h__Reader::OpenRead(const std::string& filename)
 {
   Result_t result = OpenMXFRead(filename);
-  
+
   if( ASDCP_SUCCESS(result) )
     {
       if ( m_EssenceDescriptor == 0 )
@@ -599,7 +600,7 @@ ASDCP::TimedText::MXFWriter::h__Writer::SetSourceStream(ASDCP::TimedText::TimedT
       AddEssenceDescriptor(UL(m_Dict->ul(MDD_TimedTextWrappingClip)));
 
       result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize);
-      
+
       if ( KM_SUCCESS(result) )
 	result = CreateBodyPart(m_TDesc.EditRate);
     }
@@ -627,13 +628,13 @@ ASDCP::TimedText::MXFWriter::h__Writer::WriteTimedTextResource(const std::string
 
       ui32_t str_size = XMLDoc.size();
       FrameBuffer FrameBuf(str_size);
-      
+
       memcpy(FrameBuf.Data(), XMLDoc.c_str(), str_size);
       FrameBuf.Size(str_size);
 
       IndexTableSegment::IndexEntry Entry;
       Entry.StreamOffset = m_StreamOffset;
-      
+
       if ( ASDCP_SUCCESS(result) )
 	result = WriteEKLVPacket(FrameBuf, m_EssenceUL, Ctx, HMAC);
 
@@ -763,7 +764,7 @@ ASDCP::TimedText::MXFWriter::OpenWrite(const std::string& filename, const Writer
 
   m_Writer = new h__Writer(DefaultSMPTEDict());
   m_Writer->m_Info = Info;
-  
+
   Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
 
   if ( ASDCP_SUCCESS(result) )
diff --git a/asdcplib/src/AS_DCP_internal.h b/asdcplib/src/AS_DCP_internal.h
index 8bc4bce8..ca60d39b 100755
--- a/asdcplib/src/AS_DCP_internal.h
+++ b/asdcplib/src/AS_DCP_internal.h
@@ -331,7 +331,7 @@ namespace ASDCP
 	  // get absolute frame position and go read the frame's key and length
 	  Result_t result = RESULT_OK;
 
-	  if ( TmpEntry.StreamOffset != m_LastPosition )
+	  if ( ((Kumu::fpos_t) TmpEntry.StreamOffset) != m_LastPosition )
 	    {
 	      m_LastPosition = TmpEntry.StreamOffset;
 	      result = m_File.Seek(TmpEntry.StreamOffset);
diff --git a/asdcplib/src/h__02_Reader.cpp b/asdcplib/src/h__02_Reader.cpp
index b83fdffc..79211626 100644
--- a/asdcplib/src/h__02_Reader.cpp
+++ b/asdcplib/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: h__02_Reader.cpp,v 1.15 2015/10/12 15:30:46 jhurst Exp $
   \brief   MXF file reader base class
@@ -62,14 +62,15 @@ AS_02::default_md_object_init()
 //---------------------------------------------------------------------------------
 //
 
-    
+
 AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary*& d) :
+  ASDCP::MXF::Partition(d),
   m_Duration(0), m_BytesPerEditUnit(0),
-  ASDCP::MXF::Partition(d), m_Dict(d) {}
+  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 +199,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);
@@ -403,7 +404,6 @@ AS_02::h__AS02Reader::OpenMXFRead(const char* filename)
     {
       //
       UL OP1a_ul(m_Dict->ul(MDD_OP1a));
-      InterchangeObject* Object;
       m_Info.LabelSetType = LS_MXF_SMPTE;
 
       if ( m_HeaderPart.OperationalPattern != OP1a_ul )
diff --git a/asdcplib/src/h__02_Writer.cpp b/asdcplib/src/h__02_Writer.cpp
index 972e556c..77c33ac6 100644
--- a/asdcplib/src/h__02_Writer.cpp
+++ b/asdcplib/src/h__02_Writer.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_Writer.cpp
   \version $Id: h__02_Writer.cpp,v 1.14 2015/10/09 23:41:11 jhurst Exp $
   \brief   MXF file writer base class
@@ -58,7 +58,7 @@ AS_02::MXF::AS02IndexWriterVBR::WriteToFile(Kumu::FileWriter& Writer)
   assert(m_Dict);
   ASDCP::FrameBuffer index_body_buffer;
   ui32_t   index_body_size = m_PacketList->m_List.size() * MaxIndexSegmentSize; // segment-count * max-segment-size
-  Result_t result = index_body_buffer.Capacity(index_body_size); 
+  Result_t result = index_body_buffer.Capacity(index_body_size);
   ui64_t start_position = 0;
 
   if ( m_CurrentSegment != 0 )
@@ -185,7 +185,7 @@ AS_02::h__AS02WriterFrame::WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,co
 				      m_StreamOffset, FrameBuf, EssenceUL, Ctx, HMAC);
 
   if ( KM_SUCCESS(result) )
-    {  
+    {
       IndexTableSegment::IndexEntry Entry;
       Entry.StreamOffset = this_stream_offset;
       m_IndexWriter.PushIndexEntry(Entry);
@@ -233,7 +233,7 @@ AS_02::MXF::AS02IndexWriterCBR::WriteToFile(Kumu::FileWriter& Writer)
   assert(m_Dict);
   ASDCP::FrameBuffer index_body_buffer;
   ui32_t   index_body_size = MaxIndexSegmentSize; // segment-count * max-segment-size
-  Result_t result = index_body_buffer.Capacity(index_body_size); 
+  Result_t result = index_body_buffer.Capacity(index_body_size);
 
   m_CurrentSegment = new IndexTableSegment(m_Dict);
   assert(m_CurrentSegment);
@@ -306,7 +306,7 @@ AS_02::h__AS02WriterClip::HasOpenClip() const
 
 //
 Result_t
-AS_02::h__AS02WriterClip::StartClip(const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext* HMAC)
+AS_02::h__AS02WriterClip::StartClip(const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext*)
 {
   if ( Ctx != 0 )
     {
@@ -368,7 +368,7 @@ AS_02::h__AS02WriterClip::FinalizeClip(ui32_t bytes_per_frame)
       result = m_File.Seek(current_position);
       m_ClipStart = 0;
     }
-  
+
   return result;
 }
 
diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
index 5282e969..fa1e58be 100644
--- a/asdcplib/src/wscript
+++ b/asdcplib/src/wscript
@@ -71,11 +71,17 @@ def build(bld):
                  MXF.cpp
 		 Index.cpp
                  Metadata.cpp
+                 AS_02_JP2K.cpp
+                 AS_02_PCM.cpp
+                 AS_02_PHDR.cpp
+                 AS_02_TimedText.cpp
                  AS_DCP.cpp
                  AS_DCP_MXF.cpp
                  AS_DCP_AES.cpp
                  h__Reader.cpp
+                 h__02_Reader.cpp
                  h__Writer.cpp
+                 h__02_Writer.cpp
                  AS_DCP_MPEG2.cpp
                  AS_DCP_JP2K.cpp
                  AS_DCP_PCM.cpp