working multi-dict

1 files changed, 59 insertions, 59 deletions

diff --git a/src/Metadata.h b/src/Metadata.h
index b5a255e..4c83034 100755
--- a/src/Metadata.h
+++ b/src/Metadata.h
@@ -38,7 +38,7 @@ namespace ASDCP
 {
   namespace MXF
     {
-      void Metadata_InitTypes(const Dictionary& Dict);
+      void Metadata_InitTypes(const Dictionary*& Dict);
 
       //
 
@@ -49,7 +49,7 @@ namespace ASDCP
 	  Identification();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID ThisGenerationUID;
           UTF16String CompanyName;
           UTF16String ProductName;
@@ -60,7 +60,7 @@ namespace ASDCP
           VersionType ToolkitVersion;
           UTF16String Platform;
 
-  Identification(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  Identification(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~Identification() {}
           virtual const char* HasName() { return "Identification"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -77,11 +77,11 @@ namespace ASDCP
 	  ContentStorage();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           Batch<UUID> Packages;
           Batch<UUID> EssenceContainerData;
 
-  ContentStorage(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  ContentStorage(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~ContentStorage() {}
           virtual const char* HasName() { return "ContentStorage"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -98,12 +98,12 @@ namespace ASDCP
 	  EssenceContainerData();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UMID LinkedPackageUID;
           ui32_t IndexSID;
           ui32_t BodySID;
 
-  EssenceContainerData(const Dictionary& d) : InterchangeObject(d), m_Dict(d), IndexSID(0), BodySID(0) {}
+  EssenceContainerData(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), IndexSID(0), BodySID(0) {}
 	  virtual ~EssenceContainerData() {}
           virtual const char* HasName() { return "EssenceContainerData"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -120,14 +120,14 @@ namespace ASDCP
 	  GenericPackage();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UMID PackageUID;
           UTF16String Name;
           Timestamp PackageCreationDate;
           Timestamp PackageModifiedDate;
           Batch<UUID> Tracks;
 
-  GenericPackage(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  GenericPackage(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~GenericPackage() {}
           virtual const char* HasName() { return "GenericPackage"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -142,9 +142,9 @@ namespace ASDCP
 	  MaterialPackage();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
 
-  MaterialPackage(const Dictionary& d) : GenericPackage(d), m_Dict(d) {}
+  MaterialPackage(const Dictionary*& d) : GenericPackage(d), m_Dict(d) {}
 	  virtual ~MaterialPackage() {}
           virtual const char* HasName() { return "MaterialPackage"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -161,10 +161,10 @@ namespace ASDCP
 	  SourcePackage();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID Descriptor;
 
-  SourcePackage(const Dictionary& d) : GenericPackage(d), m_Dict(d) {}
+  SourcePackage(const Dictionary*& d) : GenericPackage(d), m_Dict(d) {}
 	  virtual ~SourcePackage() {}
           virtual const char* HasName() { return "SourcePackage"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -181,13 +181,13 @@ namespace ASDCP
 	  GenericTrack();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui32_t TrackID;
           ui32_t TrackNumber;
           UTF16String TrackName;
           UUID Sequence;
 
-  GenericTrack(const Dictionary& d) : InterchangeObject(d), m_Dict(d), TrackID(0), TrackNumber(0) {}
+  GenericTrack(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), TrackID(0), TrackNumber(0) {}
 	  virtual ~GenericTrack() {}
           virtual const char* HasName() { return "GenericTrack"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -202,9 +202,9 @@ namespace ASDCP
 	  StaticTrack();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
 
-  StaticTrack(const Dictionary& d) : GenericTrack(d), m_Dict(d) {}
+  StaticTrack(const Dictionary*& d) : GenericTrack(d), m_Dict(d) {}
 	  virtual ~StaticTrack() {}
           virtual const char* HasName() { return "StaticTrack"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -221,11 +221,11 @@ namespace ASDCP
 	  Track();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           Rational EditRate;
           ui64_t Origin;
 
-  Track(const Dictionary& d) : GenericTrack(d), m_Dict(d), Origin(0) {}
+  Track(const Dictionary*& d) : GenericTrack(d), m_Dict(d), Origin(0) {}
 	  virtual ~Track() {}
           virtual const char* HasName() { return "Track"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -242,11 +242,11 @@ namespace ASDCP
 	  StructuralComponent();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UL DataDefinition;
           ui64_t Duration;
 
-  StructuralComponent(const Dictionary& d) : InterchangeObject(d), m_Dict(d), Duration(0) {}
+  StructuralComponent(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), Duration(0) {}
 	  virtual ~StructuralComponent() {}
           virtual const char* HasName() { return "StructuralComponent"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -261,10 +261,10 @@ namespace ASDCP
 	  Sequence();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           Batch<UUID> StructuralComponents;
 
-  Sequence(const Dictionary& d) : StructuralComponent(d), m_Dict(d) {}
+  Sequence(const Dictionary*& d) : StructuralComponent(d), m_Dict(d) {}
 	  virtual ~Sequence() {}
           virtual const char* HasName() { return "Sequence"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -281,12 +281,12 @@ namespace ASDCP
 	  SourceClip();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui64_t StartPosition;
           UMID SourcePackageID;
           ui32_t SourceTrackID;
 
-  SourceClip(const Dictionary& d) : StructuralComponent(d), m_Dict(d), StartPosition(0), SourceTrackID(0) {}
+  SourceClip(const Dictionary*& d) : StructuralComponent(d), m_Dict(d), StartPosition(0), SourceTrackID(0) {}
 	  virtual ~SourceClip() {}
           virtual const char* HasName() { return "SourceClip"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -303,12 +303,12 @@ namespace ASDCP
 	  TimecodeComponent();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui16_t RoundedTimecodeBase;
           ui64_t StartTimecode;
           ui8_t DropFrame;
 
-  TimecodeComponent(const Dictionary& d) : StructuralComponent(d), m_Dict(d), RoundedTimecodeBase(0), StartTimecode(0), DropFrame(0) {}
+  TimecodeComponent(const Dictionary*& d) : StructuralComponent(d), m_Dict(d), RoundedTimecodeBase(0), StartTimecode(0), DropFrame(0) {}
 	  virtual ~TimecodeComponent() {}
           virtual const char* HasName() { return "TimecodeComponent"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -325,11 +325,11 @@ namespace ASDCP
 	  GenericDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           Batch<UUID> Locators;
           Batch<UUID> SubDescriptors;
 
-  GenericDescriptor(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  GenericDescriptor(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~GenericDescriptor() {}
           virtual const char* HasName() { return "GenericDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -344,14 +344,14 @@ namespace ASDCP
 	  FileDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui32_t LinkedTrackID;
           Rational SampleRate;
           ui64_t ContainerDuration;
           UL EssenceContainer;
           UL Codec;
 
-  FileDescriptor(const Dictionary& d) : GenericDescriptor(d), m_Dict(d), LinkedTrackID(0), ContainerDuration(0) {}
+  FileDescriptor(const Dictionary*& d) : GenericDescriptor(d), m_Dict(d), LinkedTrackID(0), ContainerDuration(0) {}
 	  virtual ~FileDescriptor() {}
           virtual const char* HasName() { return "FileDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -368,7 +368,7 @@ namespace ASDCP
 	  GenericSoundEssenceDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           Rational AudioSamplingRate;
           ui8_t Locked;
           ui8_t AudioRefLevel;
@@ -376,7 +376,7 @@ namespace ASDCP
           ui32_t QuantizationBits;
           ui8_t DialNorm;
 
-  GenericSoundEssenceDescriptor(const Dictionary& d) : FileDescriptor(d), m_Dict(d), Locked(0), AudioRefLevel(0), ChannelCount(0), QuantizationBits(0), DialNorm(0) {}
+  GenericSoundEssenceDescriptor(const Dictionary*& d) : FileDescriptor(d), m_Dict(d), Locked(0), AudioRefLevel(0), ChannelCount(0), QuantizationBits(0), DialNorm(0) {}
 	  virtual ~GenericSoundEssenceDescriptor() {}
           virtual const char* HasName() { return "GenericSoundEssenceDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -393,13 +393,13 @@ namespace ASDCP
 	  WaveAudioDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui16_t BlockAlign;
           ui8_t SequenceOffset;
           ui32_t AvgBps;
           UL ChannelAssignment;
 
-  WaveAudioDescriptor(const Dictionary& d) : GenericSoundEssenceDescriptor(d), m_Dict(d), BlockAlign(0), SequenceOffset(0), AvgBps(0) {}
+  WaveAudioDescriptor(const Dictionary*& d) : GenericSoundEssenceDescriptor(d), m_Dict(d), BlockAlign(0), SequenceOffset(0), AvgBps(0) {}
 	  virtual ~WaveAudioDescriptor() {}
           virtual const char* HasName() { return "WaveAudioDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -416,14 +416,14 @@ namespace ASDCP
 	  GenericPictureEssenceDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui8_t FrameLayout;
           ui32_t StoredWidth;
           ui32_t StoredHeight;
           Rational AspectRatio;
           UL PictureEssenceCoding;
 
-  GenericPictureEssenceDescriptor(const Dictionary& d) : FileDescriptor(d), m_Dict(d), FrameLayout(0), StoredWidth(0), StoredHeight(0) {}
+  GenericPictureEssenceDescriptor(const Dictionary*& d) : FileDescriptor(d), m_Dict(d), FrameLayout(0), StoredWidth(0), StoredHeight(0) {}
 	  virtual ~GenericPictureEssenceDescriptor() {}
           virtual const char* HasName() { return "GenericPictureEssenceDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -440,11 +440,11 @@ namespace ASDCP
 	  RGBAEssenceDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui32_t ComponentMaxRef;
           ui32_t ComponentMinRef;
 
-  RGBAEssenceDescriptor(const Dictionary& d) : GenericPictureEssenceDescriptor(d), m_Dict(d), ComponentMaxRef(0), ComponentMinRef(0) {}
+  RGBAEssenceDescriptor(const Dictionary*& d) : GenericPictureEssenceDescriptor(d), m_Dict(d), ComponentMaxRef(0), ComponentMinRef(0) {}
 	  virtual ~RGBAEssenceDescriptor() {}
           virtual const char* HasName() { return "RGBAEssenceDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -461,7 +461,7 @@ namespace ASDCP
 	  JPEG2000PictureSubDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui16_t Rsize;
           ui32_t Xsize;
           ui32_t Ysize;
@@ -476,7 +476,7 @@ namespace ASDCP
           Raw CodingStyleDefault;
           Raw QuantizationDefault;
 
-  JPEG2000PictureSubDescriptor(const Dictionary& d) : InterchangeObject(d), m_Dict(d), Rsize(0), Xsize(0), Ysize(0), XOsize(0), YOsize(0), XTsize(0), YTsize(0), XTOsize(0), YTOsize(0), Csize(0) {}
+  JPEG2000PictureSubDescriptor(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), Rsize(0), Xsize(0), Ysize(0), XOsize(0), YOsize(0), XTsize(0), YTsize(0), XTOsize(0), YTOsize(0), Csize(0) {}
 	  virtual ~JPEG2000PictureSubDescriptor() {}
           virtual const char* HasName() { return "JPEG2000PictureSubDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -493,13 +493,13 @@ namespace ASDCP
 	  CDCIEssenceDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui32_t ComponentDepth;
           ui32_t HorizontalSubsampling;
           ui32_t VerticalSubsampling;
           ui8_t ColorSiting;
 
-  CDCIEssenceDescriptor(const Dictionary& d) : GenericPictureEssenceDescriptor(d), m_Dict(d), ComponentDepth(0), HorizontalSubsampling(0), VerticalSubsampling(0), ColorSiting(0) {}
+  CDCIEssenceDescriptor(const Dictionary*& d) : GenericPictureEssenceDescriptor(d), m_Dict(d), ComponentDepth(0), HorizontalSubsampling(0), VerticalSubsampling(0), ColorSiting(0) {}
 	  virtual ~CDCIEssenceDescriptor() {}
           virtual const char* HasName() { return "CDCIEssenceDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -516,13 +516,13 @@ namespace ASDCP
 	  MPEG2VideoDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           ui8_t CodedContentType;
           ui8_t LowDelay;
           ui32_t BitRate;
           ui8_t ProfileAndLevel;
 
-  MPEG2VideoDescriptor(const Dictionary& d) : CDCIEssenceDescriptor(d), m_Dict(d), CodedContentType(0), LowDelay(0), BitRate(0), ProfileAndLevel(0) {}
+  MPEG2VideoDescriptor(const Dictionary*& d) : CDCIEssenceDescriptor(d), m_Dict(d), CodedContentType(0), LowDelay(0), BitRate(0), ProfileAndLevel(0) {}
 	  virtual ~MPEG2VideoDescriptor() {}
           virtual const char* HasName() { return "MPEG2VideoDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -539,14 +539,14 @@ namespace ASDCP
 	  DMSegment();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UL DataDefinition;
           ui64_t EventStartPosition;
           ui64_t Duration;
           UTF16String EventComment;
           UUID DMFramework;
 
-  DMSegment(const Dictionary& d) : InterchangeObject(d), m_Dict(d), EventStartPosition(0), Duration(0) {}
+  DMSegment(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), EventStartPosition(0), Duration(0) {}
 	  virtual ~DMSegment() {}
           virtual const char* HasName() { return "DMSegment"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -563,10 +563,10 @@ namespace ASDCP
 	  CryptographicFramework();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID ContextSR;
 
-  CryptographicFramework(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  CryptographicFramework(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~CryptographicFramework() {}
           virtual const char* HasName() { return "CryptographicFramework"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -583,14 +583,14 @@ namespace ASDCP
 	  CryptographicContext();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID ContextID;
           UL SourceEssenceContainer;
           UL CipherAlgorithm;
           UL MICAlgorithm;
           UUID CryptographicKeyID;
 
-  CryptographicContext(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  CryptographicContext(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~CryptographicContext() {}
           virtual const char* HasName() { return "CryptographicContext"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -607,10 +607,10 @@ namespace ASDCP
 	  GenericDataEssenceDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UL DataEssenceCoding;
 
-  GenericDataEssenceDescriptor(const Dictionary& d) : FileDescriptor(d), m_Dict(d) {}
+  GenericDataEssenceDescriptor(const Dictionary*& d) : FileDescriptor(d), m_Dict(d) {}
 	  virtual ~GenericDataEssenceDescriptor() {}
           virtual const char* HasName() { return "GenericDataEssenceDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -627,12 +627,12 @@ namespace ASDCP
 	  TimedTextDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID ResourceID;
           UTF16String UCSEncoding;
           UTF16String NamespaceURI;
 
-  TimedTextDescriptor(const Dictionary& d) : GenericDataEssenceDescriptor(d), m_Dict(d) {}
+  TimedTextDescriptor(const Dictionary*& d) : GenericDataEssenceDescriptor(d), m_Dict(d) {}
 	  virtual ~TimedTextDescriptor() {}
           virtual const char* HasName() { return "TimedTextDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -649,12 +649,12 @@ namespace ASDCP
 	  TimedTextResourceSubDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
           UUID AncillaryResourceID;
           UTF16String MIMEMediaType;
           ui32_t EssenceStreamID;
 
-  TimedTextResourceSubDescriptor(const Dictionary& d) : InterchangeObject(d), m_Dict(d), EssenceStreamID(0) {}
+  TimedTextResourceSubDescriptor(const Dictionary*& d) : InterchangeObject(d), m_Dict(d), EssenceStreamID(0) {}
 	  virtual ~TimedTextResourceSubDescriptor() {}
           virtual const char* HasName() { return "TimedTextResourceSubDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
@@ -671,9 +671,9 @@ namespace ASDCP
 	  StereoscopicPictureSubDescriptor();
 
 	public:
-	  const Dictionary& m_Dict;
+	  const Dictionary*& m_Dict;
 
-  StereoscopicPictureSubDescriptor(const Dictionary& d) : InterchangeObject(d), m_Dict(d) {}
+  StereoscopicPictureSubDescriptor(const Dictionary*& d) : InterchangeObject(d), m_Dict(d) {}
 	  virtual ~StereoscopicPictureSubDescriptor() {}
           virtual const char* HasName() { return "StereoscopicPictureSubDescriptor"; }
           virtual Result_t InitFromTLVSet(TLVReader& TLVSet);