pre as-02

7 files changed, 17 insertions, 44 deletions

diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp
index 472ea40..06a47b4 100755
--- a/src/AS_DCP_PCM.cpp
+++ b/src/AS_DCP_PCM.cpp
@@ -41,7 +41,7 @@ static std::string SOUND_DEF_LABEL = "Sound Track";
 
 //
 Result_t
-PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
+ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
 {
   ASDCP_TEST_NULL(ADescObj);
   ADescObj->SampleRate = ADesc.EditRate;
@@ -84,7 +84,7 @@ PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* ADescObj)
 
 //
 ASDCP::Result_t
-MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
+ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc)
 {
   ASDCP_TEST_NULL(ADescObj);
   ADesc.EditRate = ADescObj->SampleRate;
diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index 661ab65..dd21f0d 100755
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -99,6 +99,10 @@ namespace ASDCP
   Result_t MD_to_CryptoInfo(MXF::CryptographicContext*, WriterInfo&, const Dictionary&);
   Result_t EncryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESEncContext*);
   Result_t DecryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESDecContext*);
+  Result_t PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, ASDCP::MXF::WaveAudioDescriptor* ADescObj);
+  Result_t MD_to_PCM_ADesc(ASDCP::MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc);
+  void     AddDMScrypt(Partition& HeaderPart, SourcePackage& Package,
+		       WriterInfo& Descr, const UL& WrappingUL, const Dictionary*& Dict);
 
   //
  class KLReader : public ASDCP::KLVPacket
diff --git a/src/KM_platform.h b/src/KM_platform.h
index 436e6e9..c040261 100644
--- a/src/KM_platform.h
+++ b/src/KM_platform.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2009, John Hurst
+Copyright (c) 2004-2012, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -42,37 +42,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  define WIN32_LEAN_AND_MEAN
 #  define VC_EXTRALEAN
 #  include <windows.h>
-/* we like the "SendMessage" name, so get rid of the preprocessor define
- * and replace with an inline function */
-#  undef SendMessage
-#ifdef UNICODE

-inline

-WINUSERAPI

-LRESULT

-WINAPI

-SendMessage(

-    __in HWND hWnd,

-    __in UINT Msg,

-    __in WPARAM wParam,

-    __in LPARAM lParam)

-{

-	return SendMessageW(hWnd, Msg, wParam, lParam);

-}

-#else

-inline

-WINUSERAPI

-LRESULT

-WINAPI

-SendMessage(

-    __in HWND hWnd,

-    __in UINT Msg,

-    __in WPARAM wParam,

-    __in LPARAM lParam)

-{

-	return SendMessageA(hWnd, Msg, wParam, lParam);

-}

-#endif // !UNICODE

-
 #  include <stdlib.h>
 #  include <stdio.h>
 #  include <stdarg.h>
diff --git a/src/MXFTypes.h b/src/MXFTypes.h
index eaddb38..82a5c68 100755
--- a/src/MXFTypes.h
+++ b/src/MXFTypes.h
@@ -99,7 +99,7 @@ namespace ASDCP
 	{
 	public:
 	  Batch() {}
-	  ~Batch() {}
+	  virtual ~Batch() {}
 
 	  //
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader) {
@@ -117,7 +117,7 @@ namespace ASDCP
 		result = Tmp.Unarchive(Reader);
 
 		if ( result )
-		  push_back(Tmp);
+		  this->push_back(Tmp);
 	      }
 
 	    return result;
@@ -181,7 +181,7 @@ namespace ASDCP
 	{
 	public:
 	  Array() {}
-	  ~Array() {}
+	  virtual ~Array() {}
 
 	  //
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader)
@@ -192,7 +192,7 @@ namespace ASDCP
 		{
 		  T Tmp;
 		  result = Tmp.Unarchive(Reader);
-		  push_back(Tmp);
+		  this->push_back(Tmp);
 		}
 
 	      return result;
diff --git a/src/asdcp-unwrap.cpp b/src/asdcp-unwrap.cpp
index 55d291b..ebe483c 100755
--- a/src/asdcp-unwrap.cpp
+++ b/src/asdcp-unwrap.cpp
@@ -89,7 +89,7 @@ Options:\n\
   -2                - Split Wave essence to stereo WAV files during extract.\n\
                       Default is multichannel WAV\n\
   -3                - Force stereoscopic interpretation of a JP2K file.\n\
-  -b <buffer-size>  - Specify size in bytes of picture frame buffer.\n\
+  -b <buffer-size>  - Specify size in bytes of picture frame buffer\n\
                       Defaults to 4,194,304 (4MB)\n\
   -d <duration>     - Number of frames to process, default all\n\
   -f <start-frame>  - Starting frame number, default 0\n\
@@ -104,7 +104,7 @@ Options:\n\
   -v                - Verbose, prints informative messages to stderr\n\
   -W                - Read input file only, do not write destination file\n\
   -w <width>        - Width of numeric element in a series of frame file names\n\
-                      (default 6).\n\
+                      (default 6)\n\
   -z                - Fail if j2c inputs have unequal parameters (default)\n\
   -Z                - Ignore unequal parameters in j2c inputs\n\
 \n\
diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp
index eb625d8..a704552 100755
--- a/src/asdcp-wrap.cpp
+++ b/src/asdcp-wrap.cpp
@@ -129,8 +129,8 @@ Options:\n\
   -j <key-id-str>   - Write key ID instead of creating a random value\n\
   -k <key-string>   - Use key for ciphertext operations\n\
   -M                - Do not create HMAC values when writing\n\
-  -a <UUID>         - Specify the Asset ID of a file (with -c)\n\
-  -b <buffer-size>  - Specify size in bytes of picture frame buffer.\n\
+  -a <UUID>         - Specify the Asset ID of a file\n\
+  -b <buffer-size>  - Specify size in bytes of picture frame buffer\n\
                       Defaults to 4,194,304 (4MB)\n\
   -d <duration>     - Number of frames to process, default all\n\
   -f <start-frame>  - Starting frame number, default 0\n\
diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp
index 9966cea..f21b165 100755
--- a/src/h__Writer.cpp
+++ b/src/h__Writer.cpp
@@ -83,8 +83,8 @@ ASDCP::h__Writer::~h__Writer()
 //
 // add DMS CryptographicFramework entry to source package
 void
-AddDMScrypt(Partition& HeaderPart, SourcePackage& Package,
-	    WriterInfo& Descr, const UL& WrappingUL, const Dictionary*& Dict)
+ASDCP::AddDMScrypt(Partition& HeaderPart, SourcePackage& Package,
+		   WriterInfo& Descr, const UL& WrappingUL, const Dictionary*& Dict)
 {
   assert(Dict);
   // Essence Track