c++11 tidying.

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 5a8b650b8808d753223e0e1dff6c39ba3d45fafc..f8f23a300c87d2dc5a38ac6b27306e4724653b08 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -24,7 +24,6 @@
 #include "position.h"
 #include "rect.h"
 #include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 #include <stdint.h>
 
@@ -45,8 +44,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
@@ -83,8 +85,8 @@ namespace xmlpp {
 /** Port on which player listens for play requests */
 #define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5)
 
-typedef std::vector<boost::shared_ptr<Content> > ContentList;
-typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
+typedef std::vector<std::shared_ptr<Content> > ContentList;
+typedef std::vector<std::shared_ptr<FFmpegContent> > FFmpegContentList;
 
 typedef int64_t Frame;
 
@@ -136,12 +138,17 @@ 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)
 };
 
+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:
@@ -182,7 +189,7 @@ struct Crop
 {
        Crop () : left (0), right (0), top (0), bottom (0) {}
        Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {}
-       explicit Crop (boost::shared_ptr<cxml::Node>);
+       explicit Crop (std::shared_ptr<cxml::Node>);
 
        /** Number of pixels to remove from the left-hand side */
        int left;
@@ -229,7 +236,7 @@ struct CPLSummary
 
        std::string dcp_directory;
        std::string cpl_id;
-       std::string cpl_annotation_text;
+       boost::optional<std::string> cpl_annotation_text;
        boost::filesystem::path cpl_file;
        /** true if this CPL has any encrypted assets */
        bool encrypted;
@@ -256,4 +263,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