X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=e3bedd667f7a716daee156db5451e2b6b376cc9c;hp=d052b2a9a71dd3c458bc9126785a15af263e8e6c;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d052b2a9a..e3bedd667 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -1,26 +1,28 @@
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include "types.h"
+#include "dcpomatic_assert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include "types.h"
 
 using std::max;
 using std::min;
@@ -51,7 +53,7 @@ resolution_to_string (Resolution r)
 		return "4K";
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return "";
 }
 
@@ -67,7 +69,7 @@ string_to_resolution (string s)
 		return RESOLUTION_4K;
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return RESOLUTION_2K;
 }
 
@@ -87,3 +89,50 @@ Crop::as_xml (xmlpp::Node* node) const
 	node->add_child("TopCrop")->add_child_text (raw_convert<string> (top));
 	node->add_child("BottomCrop")->add_child_text (raw_convert<string> (bottom));
 }
+
+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:
+		return "3d-top-bottom";
+	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+		return "3d-alternate";
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		return "3d-left";
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		return "3d-right";
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	DCPOMATIC_ASSERT (false);
+}
+
+VideoFrameType
+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") {
+		return VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
+	} else if (s == "3d-alternate") {
+		return VIDEO_FRAME_TYPE_3D_ALTERNATE;
+	} else if (s == "3d-left") {
+		return VIDEO_FRAME_TYPE_3D_LEFT;
+	} else if (s == "3d-right") {
+		return VIDEO_FRAME_TYPE_3D_RIGHT;
+	}
+
+	DCPOMATIC_ASSERT (false);
+}