Bump version

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index ce50814644de70bd866d6a3d6bd11803f80d8cf7..e3bedd667f7a716daee156db5451e2b6b376cc9c 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -20,7 +20,7 @@
 
 #include "types.h"
 #include "dcpomatic_assert.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 
@@ -28,6 +28,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)
 {
@@ -95,6 +96,8 @@ 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 +120,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") {