checky

4 files changed, 25 insertions, 10 deletions

diff --git a/src/AS_02_internal.h b/src/AS_02_internal.h
index 15f4486..64fe836 100644
--- a/src/AS_02_internal.h
+++ b/src/AS_02_internal.h
@@ -32,9 +32,9 @@
 #ifndef _AS_02_INTERNAL_H_
 #define _AS_02_INTERNAL_H_
 
-#include <KM_platform.h>
-#include <KM_util.h>
-#include <KM_log.h>
+#include "KM_platform.h"
+#include "KM_util.h"
+#include "KM_log.h"
 #include "Metadata.h"
 #include "AS_DCP_internal.h"
 #include "AS_02.h"
diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp
index 07b2631..1199554 100644
--- a/src/AS_DCP_TimedText.cpp
+++ b/src/AS_DCP_TimedText.cpp
@@ -271,12 +271,12 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid
     {
       Array<RIP::Pair>::const_iterator pi;
       RIP::Pair TmpPair;
-      ui32_t sequence = 1;
+      ui32_t sequence = 0;
 
       // Look up the partition start in the RIP using the SID.
       // Count the sequence length in because this is the sequence
       // value needed to  complete the HMAC.
-      for ( pi = m_HeaderPart.m_RIP.PairArray.begin(); pi != m_HeaderPart.m_RIP.PairArray.end(); pi++, sequence++ )
+      for ( pi = m_HeaderPart.m_RIP.PairArray.begin(); pi != m_HeaderPart.m_RIP.PairArray.end(); ++pi, ++sequence )
 	{
 	  if ( (*pi).BodySID == DescObject->EssenceStreamID )
 	    {
@@ -320,7 +320,7 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid
 	      // read the essence packet
 	      assert(m_Dict);
 	      if( ASDCP_SUCCESS(result) )
-		result = ReadEKLVPacket(0, 1, FrameBuf, m_Dict->ul(MDD_GenericStream_DataElement), Ctx, HMAC);
+		result = ReadEKLVPacket(0, sequence, FrameBuf, m_Dict->ul(MDD_GenericStream_DataElement), Ctx, HMAC);
 	    }
 	}
     }
diff --git a/src/KM_log.cpp b/src/KM_log.cpp
index 7ac0f90..182d91e 100755
--- a/src/KM_log.cpp
+++ b/src/KM_log.cpp
@@ -111,6 +111,7 @@ Kumu::StdioLogSink::WriteEntry(const LogEntry& Entry)
     {
       Entry.CreateStringWithOptions(buf, m_options);
       fputs(buf.c_str(), m_stream);
+      fflush(m_stream);
     }
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 51b77b0..81f1eeb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,7 @@ endif
 
 # list of all the header files that should be installed
 include_HEADERS = KM_error.h KM_fileio.h KM_log.h KM_memio.h KM_mutex.h \
-		KM_platform.h KM_prng.h KM_util.h KM_tai.h KM_xml.h AS_DCP.h
-
+		KM_platform.h KM_prng.h KM_util.h KM_tai.h KM_xml.h AS_DCP.h AS_02.h
 if DEV_HEADERS
 include_HEADERS += S12MTimecode.h MDD.h Metadata.h KLV.h MXFTypes.h MXF.h Wav.h \
 		PCMParserList.h
@@ -50,7 +49,7 @@ endif
 
 
 # list of the libraries to build and install
-lib_LTLIBRARIES = libkumu.la libasdcp.la
+lib_LTLIBRARIES = libkumu.la libasdcp.la libas02.la
 
 # sources for kumu library
 libkumu_la_SOURCES = KM_error.h KM_fileio.cpp KM_fileio.h KM_log.cpp KM_log.h \
@@ -83,6 +82,14 @@ libasdcp_la_LIBADD = libkumu.la
 libasdcp_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
 
 
+# sources for as-02 library
+libas02_la_SOURCES	= \
+		AS_02.h AS_02_MXF.cpp AS_02_JP2K.cpp AS_02_PCM.cpp h__02_Reader.cpp h__02_Writer.cpp AS_02_internal.h
+libas02_la_LDFLAGS = -release @VERSION@
+libas02_la_LIBADD = libasdcp.la libkumu.la
+libas02_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
+
+
 # Python extension
 if PYTHON_USE
 lib_LTLIBRARIES += libpyasdcp.la
@@ -125,13 +132,20 @@ endif
 # list of programs to be built and installed
 bin_PROGRAMS = \
 	asdcp-wrap asdcp-unwrap asdcp-util asdcp-info asdcp-test \
+	as-02-wrap as-02-unwrap \
 	j2c-test blackwave klvwalk wavesplit \
-	kmfilegen kmrandgen kmuuidgen 
+	kmfilegen kmrandgen kmuuidgen
 
 # sources and linkage for CLI utilities
 asdcp_test_SOURCES = asdcp-test.cpp
 asdcp_test_LDADD = libasdcp.la
 
+as_02_wrap_SOURCES = as-02-wrap.cpp
+as_02_wrap_LDADD = libas02.la
+
+as_02_unwrap_SOURCES = as-02-unwrap.cpp
+as_02_unwrap_LDADD = libas02.la
+
 asdcp_wrap_SOURCES = asdcp-wrap.cpp
 asdcp_wrap_LDADD = libasdcp.la