Clear out _next_time when seeking, so out-of-date values don't

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

diff --git a/src/lib/types.h b/src/lib/types.h
index ccb47dc6477bfa27edef8337b5baff878d48b348..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
@@ -171,7 +174,8 @@ enum ExportFormat
 {
        EXPORT_FORMAT_PRORES,
        EXPORT_FORMAT_H264_AAC,
-       EXPORT_FORMAT_H264_PCM
+       EXPORT_FORMAT_H264_PCM,
+       EXPORT_FORMAT_SUBTITLES_DCP
 };
 
 /** @struct Crop
@@ -255,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