summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormsheby <msheby@cinecert.com>2009-05-09 00:53:41 +0000
committermsheby <>2009-05-09 00:53:41 +0000
commited48db5fd3e22af1578b37b8a8f7e8ae24036897 (patch)
treee68578335705403514f837cd7fe5cfc3e98201c3 /src
parentd1520b194632da4386e0dc4731fead1f58d42970 (diff)
Add beginnings of timed text support.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/AS_DCP.h4
-rw-r--r--src/AS_DCP_TimedText.cpp2
-rw-r--r--src/TimedText_Parser.cpp2
-rwxr-xr-xsrc/asdcp-test.cpp6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/AS_DCP.h b/src/AS_DCP.h
index a6be6d2..93288dd 100755
--- a/src/AS_DCP.h
+++ b/src/AS_DCP.h
@@ -1336,7 +1336,7 @@ namespace ASDCP {
// Fill a TimedTextDescriptor struct with the values from the file's contents.
// Returns RESULT_INIT if the file is not open.
- Result_t FillDescriptor(TimedTextDescriptor&) const;
+ Result_t FillTimedTextDescriptor(TimedTextDescriptor&) const;
// Reads the complete Timed Text Resource into the given string.
Result_t ReadTimedTextResource(std::string&) const;
@@ -1409,7 +1409,7 @@ namespace ASDCP {
// Fill a TimedTextDescriptor struct with the values from the file's header.
// Returns RESULT_INIT if the file is not open.
- Result_t FillDescriptor(TimedTextDescriptor&) const;
+ Result_t FillTimedTextDescriptor(TimedTextDescriptor&) const;
// Fill a WriterInfo struct with the values from the file's header.
// Returns RESULT_INIT if the file is not open.
diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp
index 2846ec5..441a770 100644
--- a/src/AS_DCP_TimedText.cpp
+++ b/src/AS_DCP_TimedText.cpp
@@ -350,7 +350,7 @@ ASDCP::TimedText::MXFReader::OpenRead(const char* filename) const
// Fill the struct with the values from the file's header.
// Returns RESULT_INIT if the file is not open.
ASDCP::Result_t
-ASDCP::TimedText::MXFReader::FillDescriptor(TimedText::TimedTextDescriptor& TDesc) const
+ASDCP::TimedText::MXFReader::FillTimedTextDescriptor(TimedText::TimedTextDescriptor& TDesc) const
{
if ( m_Reader && m_Reader->m_File.IsOpen() )
{
diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp
index d86ef7c..2519669 100644
--- a/src/TimedText_Parser.cpp
+++ b/src/TimedText_Parser.cpp
@@ -357,7 +357,7 @@ ASDCP::TimedText::DCSubtitleParser::OpenRead(const char* filename) const
//
ASDCP::Result_t
-ASDCP::TimedText::DCSubtitleParser::FillDescriptor(TimedTextDescriptor& TDesc) const
+ASDCP::TimedText::DCSubtitleParser::FillTimedTextDescriptor(TimedTextDescriptor& TDesc) const
{
if ( m_Parser.empty() )
return RESULT_INIT;
diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp
index 6f4f289..2505ddd 100755
--- a/src/asdcp-test.cpp
+++ b/src/asdcp-test.cpp
@@ -1408,7 +1408,7 @@ write_timed_text_file(CommandOptions& Options)
// set up MXF writer
if ( ASDCP_SUCCESS(result) )
{
- Parser.FillDescriptor(TDesc);
+ Parser.FillTimedTextDescriptor(TDesc);
FrameBuffer.Capacity(2*Kumu::Megabyte);
if ( Options.verbose_flag )
@@ -1519,7 +1519,7 @@ read_timed_text_file(CommandOptions& Options)
if ( ASDCP_SUCCESS(result) )
{
- Reader.FillDescriptor(TDesc);
+ Reader.FillTimedTextDescriptor(TDesc);
FrameBuffer.Capacity(2*Kumu::Megabyte);
if ( Options.verbose_flag )
@@ -1635,7 +1635,7 @@ class MyTextDescriptor : public TimedText::TimedTextDescriptor
{
public:
void FillDescriptor(TimedText::MXFReader& Reader) {
- Reader.FillDescriptor(*this);
+ Reader.FillTimedTextDescriptor(*this);
}
void Dump(FILE* stream) {