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_TimedText.cpp | |
| parent | 80463afc197c90372d3f4c7890c6520f1040aedc (diff) | |
mega datetime patch
Diffstat (limited to 'src/AS_DCP_TimedText.cpp')
| -rw-r--r-- | src/AS_DCP_TimedText.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp index 5d31a8d..07b2631 100644 --- a/src/AS_DCP_TimedText.cpp +++ b/src/AS_DCP_TimedText.cpp @@ -37,10 +37,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using Kumu::GenRandomValue; -static const ASDCP::Dictionary *sg_dict = &DefaultSMPTEDict(); -static MXF::OPAtomHeader sg_OPAtomHeader(sg_dict); -static MXF::OPAtomIndexFooter sg_OPAtomIndexFooter(sg_dict); - static std::string TIMED_TEXT_PACKAGE_LABEL = "File Package: SMPTE 429-5 clip wrapping of D-Cinema Timed Text data"; static std::string TIMED_TEXT_DEF_LABEL = "Timed Text Track"; @@ -352,7 +348,10 @@ ASDCP::MXF::OPAtomHeader& ASDCP::TimedText::MXFReader::OPAtomHeader() { if ( m_Reader.empty() ) - return sg_OPAtomHeader; + { + assert(g_OPAtomHeader); + return *g_OPAtomHeader; + } return m_Reader->m_HeaderPart; } @@ -364,7 +363,10 @@ ASDCP::MXF::OPAtomIndexFooter& ASDCP::TimedText::MXFReader::OPAtomIndexFooter() { if ( m_Reader.empty() ) - return sg_OPAtomIndexFooter; + { + assert(g_OPAtomIndexFooter); + return *g_OPAtomIndexFooter; + } return m_Reader->m_FooterPart; } @@ -682,7 +684,10 @@ ASDCP::MXF::OPAtomHeader& ASDCP::TimedText::MXFWriter::OPAtomHeader() { if ( m_Writer.empty() ) - return sg_OPAtomHeader; + { + assert(g_OPAtomHeader); + return *g_OPAtomHeader; + } return m_Writer->m_HeaderPart; } @@ -694,7 +699,10 @@ ASDCP::MXF::OPAtomIndexFooter& ASDCP::TimedText::MXFWriter::OPAtomIndexFooter() { if ( m_Writer.empty() ) - return sg_OPAtomIndexFooter; + { + assert(g_OPAtomIndexFooter); + return *g_OPAtomIndexFooter; + } return m_Writer->m_FooterPart; } |