diff options
| author | jhurst <jhurst@cinecert.com> | 2012-02-21 02:09:32 +0000 |
|---|---|---|
| committer | jhurst <> | 2012-02-21 02:09:32 +0000 |
| commit | 1a5727137f5b5ff8aecd3ec5a162c198c8c0a5e7 (patch) | |
| tree | c61a1e8ba29253e51a8ebe310db2e0fad217cd78 /src/AS_DCP_PCM.cpp | |
| parent | 80463afc197c90372d3f4c7890c6520f1040aedc (diff) | |
mega datetime patch
Diffstat (limited to 'src/AS_DCP_PCM.cpp')
| -rwxr-xr-x | src/AS_DCP_PCM.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp index 3956c71..472ea40 100755 --- a/src/AS_DCP_PCM.cpp +++ b/src/AS_DCP_PCM.cpp @@ -36,10 +36,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //------------------------------------------------------------------------------------------ -static const ASDCP::Dictionary *sg_dict = &DefaultSMPTEDict(); -static MXF::OPAtomHeader sg_OPAtomHeader(sg_dict); -static MXF::OPAtomIndexFooter sg_OPAtomIndexFooter(sg_dict); - static std::string PCM_PACKAGE_LABEL = "File Package: SMPTE 382M frame wrapping of wave audio"; static std::string SOUND_DEF_LABEL = "Sound Track"; @@ -324,7 +320,10 @@ ASDCP::MXF::OPAtomHeader& ASDCP::PCM::MXFReader::OPAtomHeader() { if ( m_Reader.empty() ) - return sg_OPAtomHeader; + { + assert(g_OPAtomHeader); + return *g_OPAtomHeader; + } return m_Reader->m_HeaderPart; } @@ -336,7 +335,10 @@ ASDCP::MXF::OPAtomIndexFooter& ASDCP::PCM::MXFReader::OPAtomIndexFooter() { if ( m_Reader.empty() ) - return sg_OPAtomIndexFooter; + { + assert(g_OPAtomIndexFooter); + return *g_OPAtomIndexFooter; + } return m_Reader->m_FooterPart; } @@ -579,7 +581,10 @@ ASDCP::MXF::OPAtomHeader& ASDCP::PCM::MXFWriter::OPAtomHeader() { if ( m_Writer.empty() ) - return sg_OPAtomHeader; + { + assert(g_OPAtomHeader); + return *g_OPAtomHeader; + } return m_Writer->m_HeaderPart; } @@ -591,7 +596,10 @@ ASDCP::MXF::OPAtomIndexFooter& ASDCP::PCM::MXFWriter::OPAtomIndexFooter() { if ( m_Writer.empty() ) - return sg_OPAtomIndexFooter; + { + assert(g_OPAtomIndexFooter); + return *g_OPAtomIndexFooter; + } return m_Writer->m_FooterPart; } |