X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=a0095cedfdf1e96bdba7f22fd4e86a0b36943ca2;hp=d9108a94219dcb82aef96d66aa03e4a8f6a16fdb;hb=HEAD;hpb=4becf7d0cb19fbbdad4f31b0881b77e689d2c1d6

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d9108a942..58382fdc7 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -23,6 +23,7 @@
 #include "dcpomatic_assert.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
+#include <dcp/filesystem.h>
 #include <dcp/raw_convert.h>
 #include <dcp/reel_asset.h>
 #include <dcp/reel_file_asset.h>
@@ -43,99 +44,8 @@ using std::vector;
 using dcp::raw_convert;
 
 
-TextType
-string_to_text_type (string s)
-{
-	if (s == "unknown") {
-		return TextType::UNKNOWN;
-	} else if (s == "open-subtitle") {
-		return TextType::OPEN_SUBTITLE;
-	} else if (s == "closed-caption") {
-		return TextType::CLOSED_CAPTION;
-	} else {
-		throw MetadataError (String::compose ("Unknown text type %1", s));
-	}
-}
-
-string
-text_type_to_string (TextType t)
-{
-	switch (t) {
-	case TextType::UNKNOWN:
-		return "unknown";
-	case TextType::OPEN_SUBTITLE:
-		return "open-subtitle";
-	case TextType::CLOSED_CAPTION:
-		return "closed-caption";
-	default:
-		DCPOMATIC_ASSERT (false);
-	}
-}
-
-string
-text_type_to_name (TextType t)
-{
-	switch (t) {
-	case TextType::UNKNOWN:
-		return _("Timed text");
-	case TextType::OPEN_SUBTITLE:
-		return _("Open subtitles");
-	case TextType::CLOSED_CAPTION:
-		return _("Closed captions");
-	default:
-		DCPOMATIC_ASSERT (false);
-	}
-}
-
-string
-video_frame_type_to_string (VideoFrameType t)
-{
-	switch (t) {
-	case VideoFrameType::TWO_D:
-		return "2d";
-	case VideoFrameType::THREE_D:
-		return "3d";
-	case VideoFrameType::THREE_D_LEFT_RIGHT:
-		return "3d-left-right";
-	case VideoFrameType::THREE_D_TOP_BOTTOM:
-		return "3d-top-bottom";
-	case VideoFrameType::THREE_D_ALTERNATE:
-		return "3d-alternate";
-	case VideoFrameType::THREE_D_LEFT:
-		return "3d-left";
-	case VideoFrameType::THREE_D_RIGHT:
-		return "3d-right";
-	default:
-		DCPOMATIC_ASSERT (false);
-	}
-
-	DCPOMATIC_ASSERT (false);
-}
-
-VideoFrameType
-string_to_video_frame_type (string s)
-{
-	if (s == "2d") {
-		return VideoFrameType::TWO_D;
-	} else if (s == "3d") {
-		return VideoFrameType::THREE_D;
-	} else if (s == "3d-left-right") {
-		return VideoFrameType::THREE_D_LEFT_RIGHT;
-	} else if (s == "3d-top-bottom") {
-		return VideoFrameType::THREE_D_TOP_BOTTOM;
-	} else if (s == "3d-alternate") {
-		return VideoFrameType::THREE_D_ALTERNATE;
-	} else if (s == "3d-left") {
-		return VideoFrameType::THREE_D_LEFT;
-	} else if (s == "3d-right") {
-		return VideoFrameType::THREE_D_RIGHT;
-	}
-
-	DCPOMATIC_ASSERT (false);
-}
-
 CPLSummary::CPLSummary (boost::filesystem::path p)
-	: dcp_directory (p.leaf().string())
+	: dcp_directory(p.filename().string())
 {
 	dcp::DCP dcp (p);
 
@@ -162,41 +72,8 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 	}
 
 	boost::system::error_code ec;
-	auto last_write = boost::filesystem::last_write_time (p, ec);
+	auto last_write = dcp::filesystem::last_write_time(p, ec);
 	last_write_time = ec ? 0 : last_write;
 }
 
 
-bool operator== (NamedChannel const& a, NamedChannel const& b)
-{
-	return a.name == b.name && a.index == b.index;
-}
-
-
-string
-video_range_to_string (VideoRange r)
-{
-	switch (r) {
-	case VideoRange::FULL:
-		return "full";
-	case VideoRange::VIDEO:
-		return "video";
-	default:
-		DCPOMATIC_ASSERT (false);
-	}
-}
-
-
-VideoRange
-string_to_video_range (string s)
-{
-	if (s == "full") {
-		return VideoRange::FULL;
-	} else if (s == "video") {
-		return VideoRange::VIDEO;
-	}
-
-	DCPOMATIC_ASSERT (false);
-	return VideoRange::FULL;
-}
-