Add NamedChannel and use it to hide the never-used channels

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 94e101a3d682a43127eec28667c54bbe1ffb24bc..2ba0408adb3019b2f59c6b6569948be117f7a27e 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -45,8 +45,11 @@ namespace xmlpp {
 /** The version number of the protocol used to communicate
  *  with servers.  Intended to be bumped when incompatibilities
  *  are introduced.  v2 uses 64+n
+ *
+ *  64 - first version used
+ *  65 - v2.16.0 - checksums added to communication
  */
-#define SERVER_LINK_VERSION (64+0)
+#define SERVER_LINK_VERSION (64+1)
 
 /** A film of F seconds at f FPS will be Ff frames;
     Consider some delta FPS d, so if we run the same
@@ -136,6 +139,12 @@ enum ChangeType
        CHANGE_TYPE_CANCELLED
 };
 
+enum VideoRange
+{
+       VIDEO_RANGE_FULL, ///< full,  or "JPEG" (0-255 for 8-bit)
+       VIDEO_RANGE_VIDEO ///< video, or "MPEG" (16-235 for 8-bit)
+};
+
 /** Type of captions.
  *
  *  The generally accepted definitions seem to be:
@@ -164,7 +173,9 @@ extern TextType string_to_text_type (std::string s);
 enum ExportFormat
 {
        EXPORT_FORMAT_PRORES,
-       EXPORT_FORMAT_H264
+       EXPORT_FORMAT_H264_AAC,
+       EXPORT_FORMAT_H264_PCM,
+       EXPORT_FORMAT_SUBTITLES_DCP
 };
 
 /** @struct Crop
@@ -248,4 +259,20 @@ enum EmailProtocol {
        EMAIL_PROTOCOL_SSL
 };
 
+
+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