Install KM_log.h

30 files changed, 48 insertions, 46 deletions

diff --git a/src/AS_02_internal.h b/src/AS_02_internal.h
index 33726ee..add8733 100644
--- a/src/AS_02_internal.h
+++ b/src/AS_02_internal.h
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _AS_02_INTERNAL_H_
 #define _AS_02_INTERNAL_H_
 
-#include "KM_log.h"
+#include "asdcp/KM_log.h"
 #include "AS_DCP_internal.h"
 #include "asdcp/AS_02.h"
 
diff --git a/src/AS_DCP_AES.cpp b/src/AS_DCP_AES.cpp
index a320fb0..9f89140 100755
--- a/src/AS_DCP_AES.cpp
+++ b/src/AS_DCP_AES.cpp
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assert.h>
 #include <asdcp/AS_DCP.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <asdcp/KM_prng.h>
 using Kumu::DefaultLogSink;
 
diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index 7a525b8..41820a8 100755
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <asdcp/KM_platform.h>
 #include <asdcp/KM_util.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <asdcp/Metadata.h>
 
 using Kumu::DefaultLogSink;
diff --git a/src/AtmosSyncChannel_Mixer.cpp b/src/AtmosSyncChannel_Mixer.cpp
index b035341..db2401a 100644
--- a/src/AtmosSyncChannel_Mixer.cpp
+++ b/src/AtmosSyncChannel_Mixer.cpp
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 
 #include <AS_DCP.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <PCMDataProviders.h>
 
 using namespace ASDCP;
diff --git a/src/Dict.cpp b/src/Dict.cpp
index 9747b9d..42b21f8 100755
--- a/src/Dict.cpp
+++ b/src/Dict.cpp
@@ -30,8 +30,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-#include "KM_mutex.h"
-#include "KM_log.h"
+#include <asdcp/KM_mutex.h>
+#include <asdcp/KM_log.h>
 #include <asdcp/KLV.h>
 #include "MDD.cpp"
 
diff --git a/src/JP2K.cpp b/src/JP2K.cpp
index a0f2a8a..592cfb7 100755
--- a/src/JP2K.cpp
+++ b/src/JP2K.cpp
@@ -33,7 +33,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <JP2K.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 
diff --git a/src/JP2K_Codestream_Parser.cpp b/src/JP2K_Codestream_Parser.cpp
index 3213f30..4de4f0b 100755
--- a/src/JP2K_Codestream_Parser.cpp
+++ b/src/JP2K_Codestream_Parser.cpp
@@ -33,7 +33,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <asdcp/AS_DCP.h>
 #include <JP2K.h>
 #include <assert.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 //------------------------------------------------------------------------------------------
diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp
index dcdea85..93359a6 100755
--- a/src/JP2K_Sequence_Parser.cpp
+++ b/src/JP2K_Sequence_Parser.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <list>
 #include <string>
 #include <algorithm>
diff --git a/src/KLV.cpp b/src/KLV.cpp
index acf28bb..e3b5b43 100755
--- a/src/KLV.cpp
+++ b/src/KLV.cpp
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <asdcp/KLV.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp
index 9720c79..374f11c 100644
--- a/src/KM_fileio.cpp
+++ b/src/KM_fileio.cpp
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 
 #include <asdcp/KM_fileio.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <fcntl.h>
 #include <iomanip>
 
diff --git a/src/KM_log.cpp b/src/KM_log.cpp
index 2ebd058..f1c572d 100755
--- a/src/KM_log.cpp
+++ b/src/KM_log.cpp
@@ -30,8 +30,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 
 #include <asdcp/KM_util.h>
-#include <KM_log.h>
-#include <KM_mutex.h>
+#include <asdcp/KM_log.h>
+#include <asdcp/KM_mutex.h>
 #include <sys/types.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/KM_prng.cpp b/src/KM_prng.cpp
index 336bfca..a650eb8 100755
--- a/src/KM_prng.cpp
+++ b/src/KM_prng.cpp
@@ -30,8 +30,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 
 #include <asdcp/KM_prng.h>
-#include <KM_log.h>
-#include <KM_mutex.h>
+#include <asdcp/KM_log.h>
+#include <asdcp/KM_mutex.h>
 #include <string.h>
 #include <assert.h>
 #include <openssl/aes.h>
diff --git a/src/KM_util.cpp b/src/KM_util.cpp
index 5409eae..210e7ac 100755
--- a/src/KM_util.cpp
+++ b/src/KM_util.cpp
@@ -33,8 +33,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <asdcp/KM_prng.h>
 #include <asdcp/KM_memio.h>
 #include <asdcp/KM_fileio.h>
-#include <KM_log.h>
-#include <KM_mutex.h>
+#include <asdcp/KM_log.h>
+#include <asdcp/KM_mutex.h>
 #include <ctype.h>
 #include <list>
 #include <map>
diff --git a/src/KM_xml.cpp b/src/KM_xml.cpp
index ff5b728..36fbc28 100644
--- a/src/KM_xml.cpp
+++ b/src/KM_xml.cpp
@@ -30,8 +30,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <KM_xml.h>
-#include <KM_log.h>
-#include <KM_mutex.h>
+#include <asdcp/KM_log.h>
+#include <asdcp/KM_mutex.h>
 #include <stack>
 #include <map>
 
@@ -59,7 +59,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <xercesc/framework/XMLPScanToken.hpp>
 
 
-XERCES_CPP_NAMESPACE_USE 
+XERCES_CPP_NAMESPACE_USE
 
 extern "C"
 {
@@ -437,7 +437,7 @@ public:
 };
 
 // expat wrapper functions
-// 
+//
 static void
 xph_start(void* p, const XML_Char* name, const XML_Char** attrs)
 {
@@ -467,7 +467,7 @@ xph_start(void* p, const XML_Char* name, const XML_Char** attrs)
   std::string key;
   if ( ns_root != name )
     key.assign(ns_root, name - ns_root - 1);
-  
+
   ns_map::iterator ni = Ctx->Namespaces->find(key);
   if ( ni != Ctx->Namespaces->end() )
     Element->SetNamespace(ni->second);
@@ -514,7 +514,7 @@ xph_namespace_start(void* p, const XML_Char* ns_prefix, const XML_Char* ns_name)
 {
   assert(p);  assert(ns_name);
   ExpatParseContext* Ctx = (ExpatParseContext*)p;
-  
+
   if ( ns_prefix == 0 )
     ns_prefix = "";
 
@@ -578,7 +578,7 @@ Kumu::XMLElement::ParseString(const char* document, ui32_t doc_len)
 }
 
 // expat wrapper functions
-// 
+//
 static void
 xph_start_one_shot(void* p, const XML_Char* name, const XML_Char** attrs)
 {
@@ -639,7 +639,7 @@ Kumu::XMLElement::ParseFirstFromString(const char* document, ui32_t doc_len)
 
 static Mutex sg_xerces_init_lock; // protect the xerces initialized
 static bool  sg_xml_init = false; // signal initialization
-static Mutex sg_coder_lock;       // protect the transcoder context 
+static Mutex sg_coder_lock;       // protect the transcoder context
 static XMLTranscoder*   sg_coder = 0;
 static const int sg_coder_buf_len = 128 * 1024;
 static char sg_coder_buf[sg_coder_buf_len + 8];
@@ -647,7 +647,7 @@ static unsigned char sg_coder_counts[sg_coder_buf_len / sizeof(XMLCh)]; // see X
 
 static const XMLCh sg_LS[] = { chLatin_L, chLatin_S, chNull };
 static const XMLCh sg_label_UTF_8[] = { chLatin_U, chLatin_T, chLatin_F,
-					chDash, chDigit_8, chNull}; 
+					chDash, chDigit_8, chNull};
 
 //
 void
@@ -902,7 +902,7 @@ public:
     std::string key;
     if ( ns_root != name )
       key.assign(ns_root, name - ns_root - 1);
-  
+
     ns_map::iterator ni = m_Namespaces->find(key);
     if ( ni != m_Namespaces->end() )
       Element->SetNamespace(ni->second);
@@ -973,7 +973,7 @@ Kumu::XMLElement::ParseString(const char* document, ui32_t doc_len)
       DefaultLogSink().Error("Unexpected XML parser error\n");
       errorCount++;
     }
-  
+
   if ( errorCount == 0 )
     m_NamespaceOwner = (void*)docHandler->TakeNamespaceMap();
 
@@ -993,7 +993,7 @@ Kumu::XMLElement::ParseFirstFromString(const char* document, ui32_t doc_len)
     }
 
   kumu_init_xml_dom();
-  
+
   int errorCount = 0;
   SAXParser* parser = new SAXParser();
 
@@ -1040,7 +1040,7 @@ Kumu::XMLElement::ParseFirstFromString(const char* document, ui32_t doc_len)
       DefaultLogSink().Error("Unexpected XML parser error\n");
       errorCount++;
     }
-  
+
   if ( errorCount == 0 )
     m_NamespaceOwner = (void*)docHandler->TakeNamespaceMap();
 
diff --git a/src/MPEG.cpp b/src/MPEG.cpp
index 14fde66..98453fb 100755
--- a/src/MPEG.cpp
+++ b/src/MPEG.cpp
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <MPEG.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 // walk a buffer stopping at the end of the buffer or the end of a VES
@@ -216,7 +216,7 @@ ASDCP::MPEG2::VESParser::Parse(const byte_t* buf, ui32_t buf_len)
 	      // let the delegate handle the header
 	      switch( m_HBuf[3] )
 		{
-		case PIC_START:   result = m_Delegate->Picture(this, m_HBuf, m_HBufLen);   break;	  
+		case PIC_START:   result = m_Delegate->Picture(this, m_HBuf, m_HBufLen);   break;
 		case EXT_START:   result = m_Delegate->Extension(this, m_HBuf, m_HBufLen); break;
 		case SEQ_START:   result = m_Delegate->Sequence(this, m_HBuf, m_HBufLen);  break;
 		case GOP_START:   result = m_Delegate->GOP(this, m_HBuf, m_HBufLen);       break;
@@ -233,7 +233,7 @@ ASDCP::MPEG2::VESParser::Parse(const byte_t* buf, ui32_t buf_len)
 		  m_State->Goto_IDLE();
 		  return result;
 		}
-	      
+
 	      m_HBuf[0] = m_HBuf[1] = 0; m_HBuf[2] = 1; m_HBuf[3] = *p; // 001x
 	      run_len = 0;
 
diff --git a/src/MPEG2_Parser.cpp b/src/MPEG2_Parser.cpp
index 59a6f3e..f3b6e5c 100755
--- a/src/MPEG2_Parser.cpp
+++ b/src/MPEG2_Parser.cpp
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <asdcp/KM_fileio.h>
 #include <MPEG.h>
 
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 using namespace ASDCP;
diff --git a/src/MXF.cpp b/src/MXF.cpp
index 6e0abe3..1f22319 100755
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <asdcp/MXF.h>
 #include <asdcp/Metadata.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 
 using Kumu::DefaultLogSink;
 using Kumu::GenRandomValue;
diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp
index fd69789..1900b78 100755
--- a/src/MXFTypes.cpp
+++ b/src/MXFTypes.cpp
@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <asdcp/KM_prng.h>
 #include <asdcp/KM_tai.h>
 #include <asdcp/MXFTypes.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 
 using Kumu::DefaultLogSink;
 
diff --git a/src/Metadata.cpp b/src/Metadata.cpp
index 4c9a215..88f19bb 100755
--- a/src/Metadata.cpp
+++ b/src/Metadata.cpp
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-#include <KM_mutex.h>
+#include <asdcp/KM_mutex.h>
 #include <asdcp/Metadata.h>
 
 using namespace ASDCP;
diff --git a/src/PCMDataProviders.cpp b/src/PCMDataProviders.cpp
index 8eb9681..696a323 100644
--- a/src/PCMDataProviders.cpp
+++ b/src/PCMDataProviders.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <PCMDataProviders.h>
 
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 
 using namespace ASDCP;
 using namespace Kumu;
diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp
index f65aae6..1633b26 100755
--- a/src/PCMParserList.cpp
+++ b/src/PCMParserList.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <PCMParserList.h>
 #include <asdcp/KM_fileio.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <assert.h>
 
 using namespace ASDCP;
diff --git a/src/PCM_Parser.cpp b/src/PCM_Parser.cpp
index 2700aa4..9678534 100755
--- a/src/PCM_Parser.cpp
+++ b/src/PCM_Parser.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <Wav.h>
 #include <assert.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 using namespace ASDCP;
diff --git a/src/PHDR_Sequence_Parser.cpp b/src/PHDR_Sequence_Parser.cpp
index d7d8616..7dd1068 100755
--- a/src/PHDR_Sequence_Parser.cpp
+++ b/src/PHDR_Sequence_Parser.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <AS_02_PHDR.h>
 #include <KM_fileio.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <list>
 #include <string>
 #include <algorithm>
diff --git a/src/Wav.cpp b/src/Wav.cpp
index 27a4083..c8935cd 100755
--- a/src/Wav.cpp
+++ b/src/Wav.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "Wav.h"
 #include <assert.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 using Kumu::DefaultLogSink;
 
 
diff --git a/src/WavFileWriter.h b/src/WavFileWriter.h
index 5d326f2..b530099 100755
--- a/src/WavFileWriter.h
+++ b/src/WavFileWriter.h
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <KM_fileio.h>
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <Wav.h>
 #include <list>
 
diff --git a/src/KM_log.h b/src/asdcp/KM_log.h
index c604fc5..c15608a 100755
--- a/src/KM_log.h
+++ b/src/asdcp/KM_log.h
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _KM_LOG_H_
 
 #include <asdcp/KM_platform.h>
-#include <KM_mutex.h>
+#include <asdcp/KM_mutex.h>
 #include <asdcp/KM_util.h>
 #include <stdarg.h>
 #include <errno.h>
diff --git a/src/KM_mutex.h b/src/asdcp/KM_mutex.h
index b44c4f2..b44c4f2 100755
--- a/src/KM_mutex.h
+++ b/src/asdcp/KM_mutex.h
diff --git a/src/klvsplit.cpp b/src/klvsplit.cpp
index 20f9e57..9358d1c 100755
--- a/src/klvsplit.cpp
+++ b/src/klvsplit.cpp
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "MXF.h"
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 
 
 using namespace ASDCP;
diff --git a/src/klvwalk.cpp b/src/klvwalk.cpp
index dc03dbe..6ecb99c 100755
--- a/src/klvwalk.cpp
+++ b/src/klvwalk.cpp
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "AS_DCP.h"
 #include "MXF.h"
-#include <KM_log.h>
+#include <asdcp/KM_log.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/wscript b/src/wscript
index f03d802..638a89d 100644
--- a/src/wscript
+++ b/src/wscript
@@ -87,6 +87,8 @@ def build(bld):
               asdcp/KM_tai.h
               asdcp/KM_fileio.h
               asdcp/KM_prng.h
+              asdcp/KM_log.h
+              asdcp/KM_mutex.h
               asdcp/AS_DCP.h
               asdcp/AS_02.h
               asdcp/Metadata.h