Clean up after previous commit.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index ce50814644de70bd866d6a3d6bd11803f80d8cf7..97373b24ee52a481f803f35e44e28863b3f46258 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -19,8 +19,9 @@
 */
 
 #include "types.h"
+#include "compose.hpp"
 #include "dcpomatic_assert.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
@@ -28,6 +29,7 @@ using std::max;
 using std::min;
 using std::string;
 using boost::shared_ptr;
+using dcp::raw_convert;
 
 bool operator== (Crop const & a, Crop const & b)
 {
@@ -89,12 +91,39 @@ Crop::as_xml (xmlpp::Node* node) const
        node->add_child("BottomCrop")->add_child_text (raw_convert<string> (bottom));
 }
 
+CaptionType
+string_to_caption_type (string s)
+{
+       if (s == "open") {
+               return CAPTION_OPEN;
+       } else if (s == "closed") {
+               return CAPTION_CLOSED;
+       } else {
+               throw MetadataError (String::compose ("Unknown caption type %1", s));
+       }
+}
+
+string
+caption_type_to_string (CaptionType t)
+{
+       switch (t) {
+       case CAPTION_OPEN:
+               return "open";
+       case CAPTION_CLOSED:
+               return "closed";
+       default:
+               DCPOMATIC_ASSERT (false);
+       }
+}
+
 string
 video_frame_type_to_string (VideoFrameType t)
 {
        switch (t) {
        case VIDEO_FRAME_TYPE_2D:
                return "2d";
+       case VIDEO_FRAME_TYPE_3D:
+               return "3d";
        case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
                return "3d-left-right";
        case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
@@ -117,6 +146,8 @@ string_to_video_frame_type (string s)
 {
        if (s == "2d") {
                return VIDEO_FRAME_TYPE_2D;
+       } else if (s == "3d") {
+               return VIDEO_FRAME_TYPE_3D;
        } else if (s == "3d-left-right") {
                return VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
        } else if (s == "3d-top-bottom") {