release

1 files changed, 76 insertions, 76 deletions

diff --git a/src/Metadata.h b/src/Metadata.h
index bc62665..55f06d4 100755
--- a/src/Metadata.h
+++ b/src/Metadata.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005-2012, John Hurst
+Copyright (c) 2005-2015, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ namespace ASDCP
           UUID ProductUID;
           Kumu::Timestamp ModificationDate;
           VersionType ToolkitVersion;
-          optional_property<UTF16String> Platform;
+          optional_property<UTF16String > Platform;
 
       Identification(const Dictionary*& d);
       Identification(const Identification& rhs);
@@ -105,7 +105,7 @@ namespace ASDCP
 	public:
 	  const Dictionary*& m_Dict;
           UMID LinkedPackageUID;
-          optional_property<ui32_t> IndexSID;
+          optional_property<ui32_t > IndexSID;
           ui32_t BodySID;
 
       EssenceContainerData(const Dictionary*& d);
@@ -130,7 +130,7 @@ namespace ASDCP
 	public:
 	  const Dictionary*& m_Dict;
           UMID PackageUID;
-          optional_property<UTF16String> Name;
+          optional_property<UTF16String > Name;
           Kumu::Timestamp PackageCreationDate;
           Kumu::Timestamp PackageModifiedDate;
           Array<UUID> Tracks;
@@ -154,7 +154,7 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          optional_property<UUID> PackageMarker;
+          optional_property<UUID > PackageMarker;
 
       MaterialPackage(const Dictionary*& d);
       MaterialPackage(const MaterialPackage& rhs);
@@ -202,8 +202,8 @@ namespace ASDCP
 	  const Dictionary*& m_Dict;
           ui32_t TrackID;
           ui32_t TrackNumber;
-          optional_property<UTF16String> TrackName;
-          optional_property<UUID> Sequence;
+          optional_property<UTF16String > TrackName;
+          optional_property<UUID > Sequence;
 
       GenericTrack(const Dictionary*& d);
       GenericTrack(const GenericTrack& rhs);
@@ -271,7 +271,7 @@ namespace ASDCP
 	public:
 	  const Dictionary*& m_Dict;
           UL DataDefinition;
-          optional_property<ui64_t> Duration;
+          optional_property<ui64_t > Duration;
 
       StructuralComponent(const Dictionary*& d);
       StructuralComponent(const StructuralComponent& rhs);
@@ -387,11 +387,11 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          optional_property<ui32_t> LinkedTrackID;
+          optional_property<ui32_t > LinkedTrackID;
           Rational SampleRate;
-          optional_property<ui64_t> ContainerDuration;
+          optional_property<ui64_t > ContainerDuration;
           UL EssenceContainer;
-          optional_property<UL> Codec;
+          optional_property<UL > Codec;
 
       FileDescriptor(const Dictionary*& d);
       FileDescriptor(const FileDescriptor& rhs);
@@ -416,11 +416,11 @@ namespace ASDCP
 	  const Dictionary*& m_Dict;
           Rational AudioSamplingRate;
           ui8_t Locked;
-          optional_property<ui8_t> AudioRefLevel;
-          optional_property<ui8_t> ElectroSpatialFormulation;
+          optional_property<ui8_t > AudioRefLevel;
+          optional_property<ui8_t > ElectroSpatialFormulation;
           ui32_t ChannelCount;
           ui32_t QuantizationBits;
-          optional_property<ui8_t> DialNorm;
+          optional_property<ui8_t > DialNorm;
           UL SoundEssenceCoding;
 
       GenericSoundEssenceDescriptor(const Dictionary*& d);
@@ -445,11 +445,11 @@ namespace ASDCP
 	public:
 	  const Dictionary*& m_Dict;
           ui16_t BlockAlign;
-          optional_property<ui8_t> SequenceOffset;
+          optional_property<ui8_t > SequenceOffset;
           ui32_t AvgBps;
-          optional_property<UL> ChannelAssignment;
-          optional_property<Rational> ReferenceImageEditRate;
-          optional_property<ui8_t> ReferenceAudioAlignmentLevel;
+          optional_property<UL > ChannelAssignment;
+          optional_property<Rational > ReferenceImageEditRate;
+          optional_property<ui8_t > ReferenceAudioAlignmentLevel;
 
       WaveAudioDescriptor(const Dictionary*& d);
       WaveAudioDescriptor(const WaveAudioDescriptor& rhs);
@@ -472,36 +472,36 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          optional_property<ui8_t> SignalStandard;
+          optional_property<ui8_t > SignalStandard;
           ui8_t FrameLayout;
           ui32_t StoredWidth;
           ui32_t StoredHeight;
-          optional_property<ui32_t> StoredF2Offset;
-          optional_property<ui32_t> SampledWidth;
-          optional_property<ui32_t> SampledHeight;
-          optional_property<ui32_t> SampledXOffset;
-          optional_property<ui32_t> SampledYOffset;
-          optional_property<ui32_t> DisplayHeight;
-          optional_property<ui32_t> DisplayWidth;
-          optional_property<ui32_t> DisplayXOffset;
-          optional_property<ui32_t> DisplayYOffset;
-          optional_property<ui32_t> DisplayF2Offset;
+          optional_property<ui32_t > StoredF2Offset;
+          optional_property<ui32_t > SampledWidth;
+          optional_property<ui32_t > SampledHeight;
+          optional_property<ui32_t > SampledXOffset;
+          optional_property<ui32_t > SampledYOffset;
+          optional_property<ui32_t > DisplayHeight;
+          optional_property<ui32_t > DisplayWidth;
+          optional_property<ui32_t > DisplayXOffset;
+          optional_property<ui32_t > DisplayYOffset;
+          optional_property<ui32_t > DisplayF2Offset;
           Rational AspectRatio;
-          optional_property<ui8_t> ActiveFormatDescriptor;
-          optional_property<ui8_t> AlphaTransparency;
-          optional_property<UL> TransferCharacteristic;
-          optional_property<ui32_t> ImageAlignmentOffset;
-          optional_property<ui32_t> ImageStartOffset;
-          optional_property<ui32_t> ImageEndOffset;
-          optional_property<ui8_t> FieldDominance;
+          optional_property<ui8_t > ActiveFormatDescriptor;
+          optional_property<ui8_t > AlphaTransparency;
+          optional_property<UL > TransferCharacteristic;
+          optional_property<ui32_t > ImageAlignmentOffset;
+          optional_property<ui32_t > ImageStartOffset;
+          optional_property<ui32_t > ImageEndOffset;
+          optional_property<ui8_t > FieldDominance;
           UL PictureEssenceCoding;
-          optional_property<UL> CodingEquations;
-          optional_property<UL> ColorPrimaries;
-          Batch<UL> AlternativeCenterCuts;
-          optional_property<ui32_t> ActiveWidth;
-          optional_property<ui32_t> ActiveHeight;
-          optional_property<ui32_t> ActiveXOffset;
-          optional_property<ui32_t> ActiveYOffset;
+          optional_property<UL > CodingEquations;
+          optional_property<UL > ColorPrimaries;
+          optional_property<Batch<UL> > AlternativeCenterCuts;
+          optional_property<ui32_t > ActiveWidth;
+          optional_property<ui32_t > ActiveHeight;
+          optional_property<ui32_t > ActiveXOffset;
+          optional_property<ui32_t > ActiveYOffset;
 
       GenericPictureEssenceDescriptor(const Dictionary*& d);
       GenericPictureEssenceDescriptor(const GenericPictureEssenceDescriptor& rhs);
@@ -524,11 +524,11 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          optional_property<ui32_t> ComponentMaxRef;
-          optional_property<ui32_t> ComponentMinRef;
-          optional_property<ui32_t> AlphaMinRef;
-          optional_property<ui32_t> AlphaMaxRef;
-          optional_property<ui8_t> ScanningDirection;
+          optional_property<ui32_t > ComponentMaxRef;
+          optional_property<ui32_t > ComponentMinRef;
+          optional_property<ui32_t > AlphaMinRef;
+          optional_property<ui32_t > AlphaMaxRef;
+          optional_property<ui8_t > ScanningDirection;
 
       RGBAEssenceDescriptor(const Dictionary*& d);
       RGBAEssenceDescriptor(const RGBAEssenceDescriptor& rhs);
@@ -561,10 +561,10 @@ namespace ASDCP
           ui32_t XTOsize;
           ui32_t YTOsize;
           ui16_t Csize;
-          optional_property<Raw> PictureComponentSizing;
-          optional_property<Raw> CodingStyleDefault;
-          optional_property<Raw> QuantizationDefault;
-          optional_property<RGBALayout> J2CLayout;
+          optional_property<Raw > PictureComponentSizing;
+          optional_property<Raw > CodingStyleDefault;
+          optional_property<Raw > QuantizationDefault;
+          optional_property<RGBALayout > J2CLayout;
 
       JPEG2000PictureSubDescriptor(const Dictionary*& d);
       JPEG2000PictureSubDescriptor(const JPEG2000PictureSubDescriptor& rhs);
@@ -589,14 +589,14 @@ namespace ASDCP
 	  const Dictionary*& m_Dict;
           ui32_t ComponentDepth;
           ui32_t HorizontalSubsampling;
-          optional_property<ui32_t> VerticalSubsampling;
-          optional_property<ui8_t> ColorSiting;
-          optional_property<ui8_t> ReversedByteOrder;
-          optional_property<ui16_t> PaddingBits;
-          optional_property<ui32_t> AlphaSampleDepth;
-          optional_property<ui32_t> BlackRefLevel;
-          optional_property<ui32_t> WhiteReflevel;
-          optional_property<ui32_t> ColorRange;
+          optional_property<ui32_t > VerticalSubsampling;
+          optional_property<ui8_t > ColorSiting;
+          optional_property<ui8_t > ReversedByteOrder;
+          optional_property<ui16_t > PaddingBits;
+          optional_property<ui32_t > AlphaSampleDepth;
+          optional_property<ui32_t > BlackRefLevel;
+          optional_property<ui32_t > WhiteReflevel;
+          optional_property<ui32_t > ColorRange;
 
       CDCIEssenceDescriptor(const Dictionary*& d);
       CDCIEssenceDescriptor(const CDCIEssenceDescriptor& rhs);
@@ -619,16 +619,16 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          optional_property<ui8_t> SingleSequence;
-          optional_property<ui8_t> ConstantBFrames;
-          optional_property<ui8_t> CodedContentType;
-          optional_property<ui8_t> LowDelay;
-          optional_property<ui8_t> ClosedGOP;
-          optional_property<ui8_t> IdenticalGOP;
-          optional_property<ui8_t> MaxGOP;
-          optional_property<ui8_t> BPictureCount;
-          optional_property<ui32_t> BitRate;
-          optional_property<ui8_t> ProfileAndLevel;
+          optional_property<ui8_t > SingleSequence;
+          optional_property<ui8_t > ConstantBFrames;
+          optional_property<ui8_t > CodedContentType;
+          optional_property<ui8_t > LowDelay;
+          optional_property<ui8_t > ClosedGOP;
+          optional_property<ui8_t > IdenticalGOP;
+          optional_property<ui8_t > MaxGOP;
+          optional_property<ui8_t > BPictureCount;
+          optional_property<ui32_t > BitRate;
+          optional_property<ui8_t > ProfileAndLevel;
 
       MPEG2VideoDescriptor(const Dictionary*& d);
       MPEG2VideoDescriptor(const MPEG2VideoDescriptor& rhs);
@@ -754,7 +754,7 @@ namespace ASDCP
           UUID ResourceID;
           UTF16String UCSEncoding;
           UTF16String NamespaceURI;
-          optional_property<UTF16String> RFC5646LanguageTagList;
+          optional_property<UTF16String > RFC5646LanguageTagList;
 
       TimedTextDescriptor(const Dictionary*& d);
       TimedTextDescriptor(const TimedTextDescriptor& rhs);
@@ -872,9 +872,9 @@ namespace ASDCP
           UL MCALabelDictionaryID;
           UUID MCALinkID;
           UTF16String MCATagSymbol;
-          optional_property<UTF16String> MCATagName;
-          optional_property<ui32_t> MCAChannelID;
-          optional_property<ISO8String> RFC5646SpokenLanguage;
+          optional_property<UTF16String > MCATagName;
+          optional_property<ui32_t > MCAChannelID;
+          optional_property<ISO8String > RFC5646SpokenLanguage;
 
       MCALabelSubDescriptor(const Dictionary*& d);
       MCALabelSubDescriptor(const MCALabelSubDescriptor& rhs);
@@ -897,7 +897,7 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          UUID SoundfieldGroupLinkID;
+          optional_property<UUID > SoundfieldGroupLinkID;
 
       AudioChannelLabelSubDescriptor(const Dictionary*& d);
       AudioChannelLabelSubDescriptor(const AudioChannelLabelSubDescriptor& rhs);
@@ -920,7 +920,7 @@ namespace ASDCP
 
 	public:
 	  const Dictionary*& m_Dict;
-          Array<UUID> GroupOfSoundfieldGroupsLinkID;
+          optional_property<Array<UUID> > GroupOfSoundfieldGroupsLinkID;
 
       SoundfieldGroupLabelSubDescriptor(const Dictionary*& d);
       SoundfieldGroupLabelSubDescriptor(const SoundfieldGroupLabelSubDescriptor& rhs);