removed nascent ST2052-1 support pending completion

diff --git a/README b/README
index bb34a1e4d289d15f43ac4fc78f7b815978ed1810..941d7193e83f7844fe0f302d39f521a143001959 100755 (executable)
--- a/README
+++ b/README
@@ -141,11 +141,6 @@ command-line utilities all respond to -h.
 Change History
 
 2013-07-02 – Additional IMF/AS-02 support, bug fixes 2.0.1
-  o Added preliminary support for timed-text wrapping for AS-02. This
-    work will require changes in SMPTE ST 429-5 and perhaps other
-    standards work, so files created with this implementation are
-    "speculative".  Publication of the revised ST 429-5 may not occur
-    until early 2015.
   o Fixed missing-index-partion bugs for AS-02 files.
   o Moved LocalFilenameResolver into the AS_DCP public API so that it
     can be used by other modules including AS-02.
@@ -166,7 +161,6 @@ Change History
          GenericPictureEssenceDescriptor_ActiveXOffset
          GenericPictureEssenceDescriptor_ActiveYOffset
   o Added some essence descriptor options to as-02-wrap.
-  o Added TTML timed-text wrapping option to as-02-wrap.
   o Changed bit rate display in asdcp-info from mebi-bits/s to
     mega-bits/s.
   o Added "SMPTE" / "Interop" format type display to asdcp-info.

diff --git a/src/Makefile.am b/src/Makefile.am
index 83f85975b861978c6792c20b9aac1d2ae1ffc66a..d9c981e42be6d319d4d9a4eb7221de0cb41da90f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -128,10 +128,8 @@ libas02_la_SOURCES = \
        AS_02_internal.h \
        h__02_Reader.cpp \
        h__02_Writer.cpp \
-       ST2052_TextParser.cpp \
        AS_02_JP2K.cpp \
-       AS_02_PCM.cpp \
-       AS_02_TimedText.cpp
+       AS_02_PCM.cpp
 
 libas02_la_LDFLAGS = -release @VERSION@
 libas02_la_LIBADD = libasdcp.la libkumu.la

diff --git a/src/as-02-wrap.cpp b/src/as-02-wrap.cpp
index 0a31a60c5d137544c8fa06e2e4dc611db1dff529..958489ec31a3162a9c1b6b939f6077110759fb10 100755 (executable)
--- a/src/as-02-wrap.cpp
+++ b/src/as-02-wrap.cpp
@@ -692,6 +692,11 @@ write_PCM_file(CommandOptions& Options)
 }
 
 
+
+#if 0
+// NOT YET, unfinished business with ST 2052-1
+
+
 //------------------------------------------------------------------------------------------
 // TimedText essence
 
@@ -807,6 +812,8 @@ write_timed_text_file(CommandOptions& Options)
   return result;
 }
 
+#endif
+
 //
 int
 main(int argc, const char** argv)