More player debugging for butler video-full states.

[dcpomatic.git] / src / lib / types.cc

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 7f0bf43057d75f9c770e7369b6ffde721c8b522a..898abeca4c2ed531bbff7da624fa6683cd5af3dc 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -94,37 +94,43 @@ Crop::as_xml (xmlpp::Node* node) const
 }
 
 TextType
-string_to_caption_type (string s)
+string_to_text_type (string s)
 {
-       if (s == "open") {
-               return CAPTION_OPEN;
-       } else if (s == "closed") {
-               return CAPTION_CLOSED;
+       if (s == "unknown") {
+               return TEXT_UNKNOWN;
+       } else if (s == "open-subtitle") {
+               return TEXT_OPEN_SUBTITLE;
+       } else if (s == "closed-caption") {
+               return TEXT_CLOSED_CAPTION;
        } else {
-               throw MetadataError (String::compose ("Unknown caption type %1", s));
+               throw MetadataError (String::compose ("Unknown text type %1", s));
        }
 }
 
 string
-caption_type_to_string (TextType t)
+text_type_to_string (TextType t)
 {
        switch (t) {
-       case CAPTION_OPEN:
-               return "open";
-       case CAPTION_CLOSED:
-               return "closed";
+       case TEXT_UNKNOWN:
+               return "unknown";
+       case TEXT_OPEN_SUBTITLE:
+               return "open-subtitle";
+       case TEXT_CLOSED_CAPTION:
+               return "closed-caption";
        default:
                DCPOMATIC_ASSERT (false);
        }
 }
 
 string
-caption_type_to_name (TextType t)
+text_type_to_name (TextType t)
 {
        switch (t) {
-       case CAPTION_OPEN:
-               return _("Subtitles");
-       case CAPTION_CLOSED:
+       case TEXT_UNKNOWN:
+               return _("Timed text");
+       case TEXT_OPEN_SUBTITLE:
+               return _("Open subtitles");
+       case TEXT_CLOSED_CAPTION:
                return _("Closed captions");
        default:
                DCPOMATIC_ASSERT (false);