Add video_{range,frame_type}.{cc,h} and remove some types.h includes.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 6bac0cf3efe0298f0e734b10d6a1e60567f0a379..fd4b8906ce19e5c67e2c8e349028369a277e3f27 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -43,40 +43,6 @@ using std::vector;
 using dcp::raw_convert;
 
 
-/** @param r Resolution.
- *  @return Untranslated string representation.
- */
-string
-resolution_to_string (Resolution r)
-{
-       switch (r) {
-       case Resolution::TWO_K:
-               return "2K";
-       case Resolution::FOUR_K:
-               return "4K";
-       }
-
-       DCPOMATIC_ASSERT (false);
-       return "";
-}
-
-
-Resolution
-string_to_resolution (string s)
-{
-       if (s == "2K") {
-               return Resolution::TWO_K;
-       }
-
-       if (s == "4K") {
-               return Resolution::FOUR_K;
-       }
-
-       DCPOMATIC_ASSERT (false);
-       return Resolution::TWO_K;
-}
-
-
 TextType
 string_to_text_type (string s)
 {
@@ -121,53 +87,6 @@ text_type_to_name (TextType t)
        }
 }
 
-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())
 {
@@ -201,36 +120,3 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 }
 
 
-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;
-}
-