X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=36059401ec8eb96d73a6921d4715443ab028d9fc;hb=7cb1677e10b9692698ede5741c50d8c4b4144ddf;hp=ad9158c8c232914c5cdf07752c1d57d96973b45c;hpb=a3ef6c08705798ac1cd8b62b77697c35c3506567;p=dcpomatic.git

diff --git a/src/lib/types.h b/src/lib/types.h
index ad9158c8c..36059401e 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -86,23 +86,6 @@ typedef std::vector<std::shared_ptr<FFmpegContent>> FFmpegContentList;
 
 typedef int64_t Frame;
 
-enum class VideoFrameType
-{
-	TWO_D,
-	/** `True' 3D content, e.g. 3D DCPs */
-	THREE_D,
-	THREE_D_LEFT_RIGHT,
-	THREE_D_TOP_BOTTOM,
-	THREE_D_ALTERNATE,
-	/** This content is all the left frames of some 3D */
-	THREE_D_LEFT,
-	/** This content is all the right frames of some 3D */
-	THREE_D_RIGHT
-};
-
-std::string video_frame_type_to_string (VideoFrameType);
-VideoFrameType string_to_video_frame_type (std::string);
-
 enum class Eyes
 {
 	BOTH,
@@ -128,42 +111,6 @@ enum class ReelType
 };
 
 
-enum class VideoRange
-{
-	FULL, ///< full,  or "JPEG" (0-255 for 8-bit)
-	VIDEO ///< video, or "MPEG" (16-235 for 8-bit)
-};
-
-extern std::string video_range_to_string (VideoRange r);
-extern VideoRange string_to_video_range (std::string s);
-
-
-/** Type of captions.
- *
- *  The generally accepted definitions seem to be:
- *  - subtitles: text for an audience who doesn't speak the film's language
- *  - captions:  text for a hearing-impaired audience
- *  - open:      on-screen
- *  - closed:    only visible by some audience members
- *
- *  At the moment DoM supports open subtitles and closed captions.
- *
- *  There is some use of the word `subtitle' in the code which may mean
- *  caption in some contexts.
- */
-enum class TextType
-{
-	UNKNOWN,
-	OPEN_SUBTITLE,
-	CLOSED_CAPTION,
-	COUNT
-};
-
-extern std::string text_type_to_string (TextType t);
-extern std::string text_type_to_name (TextType t);
-extern TextType string_to_text_type (std::string s);
-
-
 struct CPLSummary
 {
 	CPLSummary (boost::filesystem::path p);
@@ -199,19 +146,4 @@ enum class EmailProtocol {
 };
 
 
-class NamedChannel
-{
-public:
-	NamedChannel (std::string name_, int index_)
-		: name(name_)
-		, index(index_)
-	{}
-
-	std::string name;
-	int index;
-};
-
-
-bool operator== (NamedChannel const& a, NamedChannel const& b);
-
 #endif