X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FMXFTypes.h;h=e98a2e9d7946284b312ef35a64ee92261a3a7650;hb=0cc43cc3765c003d60196ff45213c2835281a0c3;hp=d42fe6969af175dac076279d6a5f9c5d034a3016;hpb=65a8ec13b66c700b74788d3fc7525e91cf62bab0;p=asdcplib.git

diff --git a/src/MXFTypes.h b/src/MXFTypes.h
index d42fe69..e98a2e9 100755
--- a/src/MXFTypes.h
+++ b/src/MXFTypes.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005-2009, John Hurst
+Copyright (c) 2005-2012, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -41,9 +41,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // used with TLVReader::Read*
 //
 // these are used below to manufacture arguments
-#define OBJ_READ_ARGS(s,l) m_Dict.Type(MDD_##s##_##l), &l
-#define OBJ_WRITE_ARGS(s,l) m_Dict.Type(MDD_##s##_##l), &l
-#define OBJ_TYPE_ARGS(t) m_Dict.Type(MDD_##t).ul
+#define OBJ_READ_ARGS(s,l) m_Dict->Type(MDD_##s##_##l), &l
+#define OBJ_WRITE_ARGS(s,l) m_Dict->Type(MDD_##s##_##l), &l
+#define OBJ_READ_ARGS_OPT(s,l) m_Dict->Type(MDD_##s##_##l), &l.get()
+#define OBJ_WRITE_ARGS_OPT(s,l) m_Dict->Type(MDD_##s##_##l), &l.get()
+#define OBJ_TYPE_ARGS(t) m_Dict->Type(MDD_##t).ul
 
 
 namespace ASDCP
@@ -99,7 +101,7 @@ namespace ASDCP
 	{
 	public:
 	  Batch() {}
-	  ~Batch() {}
+	  virtual ~Batch() {}
 
 	  //
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader) {
@@ -117,7 +119,7 @@ namespace ASDCP
 		result = Tmp.Unarchive(Reader);
 
 		if ( result )
-		  push_back(Tmp);
+		  this->push_back(Tmp);
 	      }
 
 	    return result;
@@ -181,7 +183,7 @@ namespace ASDCP
 	{
 	public:
 	  Array() {}
-	  ~Array() {}
+	  virtual ~Array() {}
 
 	  //
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader)
@@ -192,7 +194,7 @@ namespace ASDCP
 		{
 		  T Tmp;
 		  result = Tmp.Unarchive(Reader);
-		  push_back(Tmp);
+		  this->push_back(Tmp);
 		}
 
 	      return result;
@@ -237,55 +239,22 @@ namespace ASDCP
 	};
 
       //
-      class Timestamp : public Kumu::IArchive
+    class ISO8String : public std::string, public Kumu::IArchive
 	{
 	public:
-	  ui16_t Year;
-	  ui8_t  Month;
-	  ui8_t  Day;
-	  ui8_t  Hour;
-	  ui8_t  Minute;
-	  ui8_t  Second;
-	  ui8_t  Tick;
-
-	  Timestamp();
-	  Timestamp(const Timestamp& rhs);
-	  Timestamp(const char* datestr);
-	  virtual ~Timestamp();
-
-	  const Timestamp& operator=(const Timestamp& rhs);
-	  bool operator<(const Timestamp& rhs) const;
-	  bool operator==(const Timestamp& rhs) const;
-	  bool operator!=(const Timestamp& rhs) const;
-
-	  // decode and set value from string formatted by EncodeAsString
-	  Result_t    SetFromString(const char* datestr);
-	  
-	  // add the given number of days or hours to the timestamp value. Values less than zero
-	  // will cause the value to decrease
-	  void AddDays(i32_t);
-	  void AddHours(i32_t);
-
-	  // Write the timestamp value to the given buffer in the form 2004-05-01 13:20:00.000
-	  // returns 0 if the buffer is smaller than DateTimeLen
-	  const char* EncodeString(char* str_buf, ui32_t buf_len) const;
-
-	  //
-	  inline virtual bool Unarchive(Kumu::MemIOReader* Reader) {
-	    if ( ! Reader->ReadUi16BE(&Year) ) return false;
-	    if ( ! Reader->ReadRaw(&Month, 6) ) return false;
-	    return true;
-	  }
+	  ISO8String() {}
+	  ISO8String(const char*);
+	  ISO8String(const std::string&);
+	  ~ISO8String() {}
 
-	  inline virtual bool HasValue() const { return true; }
-	  inline virtual ui32_t ArchiveLength() const { return 8L; }
+	  const ISO8String& operator=(const char*);
+	  const ISO8String& operator=(const std::string&);
 
-	  //
-	  inline virtual bool Archive(Kumu::MemIOWriter* Writer) const {
-	    if ( ! Writer->WriteUi16BE(Year) ) return false;
-	    if ( ! Writer->WriteRaw(&Month, 6) ) return false;
-	    return true;
-	  }
+	  const char* EncodeString(char* str_buf, ui32_t buf_len) const;
+	  inline virtual bool HasValue() const { return ! empty(); }
+	  inline virtual ui32_t ArchiveLength() const { return sizeof(ui32_t) + size(); }
+	  virtual bool Unarchive(Kumu::MemIOReader* Reader);
+	  virtual bool Archive(Kumu::MemIOWriter* Writer) const;
 	};
 
       //
@@ -293,6 +262,8 @@ namespace ASDCP
 	{
 	public:
 	  UTF16String() {}
+	  UTF16String(const char*);
+	  UTF16String(const std::string&);
 	  ~UTF16String() {}
 
 	  const UTF16String& operator=(const char*);
@@ -359,10 +330,8 @@ namespace ASDCP
       //
       class VersionType : public Kumu::IArchive
 	{
-	  ASDCP_NO_COPY_CONSTRUCT(VersionType);
-
 	public:
-	  enum Release_t { RL_UNKNOWN, RL_RELEASE, RL_DEVELOPMENT, RL_PATCHED, RL_BETA, RL_PRIVATE };
+	  enum Release_t { RL_UNKNOWN, RL_RELEASE, RL_DEVELOPMENT, RL_PATCHED, RL_BETA, RL_PRIVATE, RL_MAX };
 	  ui16_t Major;
 	  ui16_t Minor;
 	  ui16_t Patch;
@@ -370,7 +339,18 @@ namespace ASDCP
 	  Release_t Release;
 
 	  VersionType() : Major(0), Minor(0), Patch(0), Build(0), Release(RL_UNKNOWN) {}
-	  ~VersionType() {}
+	  VersionType(const VersionType& rhs) { Copy(rhs); }
+	  virtual ~VersionType() {}
+
+	  const VersionType& operator=(const VersionType& rhs) { Copy(rhs); return *this; }
+	  void Copy(const VersionType& rhs) {
+	    Major = rhs.Major;
+	    Minor = rhs.Minor;
+	    Patch = rhs.Patch;
+	    Build = rhs.Build;
+	    Release = rhs.Release;
+	  }
+
 	  void Dump(FILE* = 0);
 
 	  const char* EncodeString(char* str_buf, ui32_t buf_len) const {
@@ -405,11 +385,18 @@ namespace ASDCP
       //
       class Raw : public Kumu::ByteString
 	{
-	  ASDCP_NO_COPY_CONSTRUCT(Raw);
-
 	public:
 	  Raw();
-	  ~Raw();
+	  Raw(const Raw& rhs) { Copy(rhs); }
+	  virtual ~Raw();
+
+	  const Raw& operator=(const Raw& rhs) { Copy(rhs); return *this; }
+	  void Copy(const Raw& rhs) {
+	    if ( KM_SUCCESS(Capacity(rhs.Length())) )
+	      {
+		Set(rhs);
+	      }
+	  }
 
 	  //
           virtual bool Unarchive(Kumu::MemIOReader* Reader);