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

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

diff --git a/src/lib/types.h b/src/lib/types.h
index e4a333bc2f0d63a15cad17e0ab65f3b1d86aefe3..9801ef5578c3efc5a105bc925b583333d9602ef0 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -18,28 +18,24 @@
 
 */
 
+
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
+
 #include "position.h"
 #include "rect.h"
 #include <dcp/util.h>
 #include <vector>
 #include <stdint.h>
 
+
 class Content;
 class VideoContent;
 class AudioContent;
 class TextContent;
 class FFmpegContent;
 
-namespace cxml {
-       class Node;
-}
-
-namespace xmlpp {
-       class Node;
-}
 
 /** The version number of the protocol used to communicate
  *  with servers.  Intended to be bumped when incompatibilities
@@ -90,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,
@@ -132,16 +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:
@@ -203,19 +172,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