X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=6fbad21883084da078dcc7ed09d7c78d51921922;hp=607c9e275098ba840af9395bbfbe7b979afee55c;hb=4e2ff7851127cd85c3e7d78b42eb884d0cda0ac3;hpb=895f945a6bababdf1964b0522d591db96368db22 diff --git a/src/lib/types.h b/src/lib/types.h index 607c9e275..6fbad2188 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -24,7 +24,6 @@ #include "position.h" #include "rect.h" #include -#include #include #include @@ -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,59 +85,63 @@ namespace xmlpp { /** Port on which player listens for play requests */ #define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5) -typedef std::vector > ContentList; -typedef std::vector > FFmpegContentList; +typedef std::vector> ContentList; +typedef std::vector> FFmpegContentList; typedef int64_t Frame; -enum VideoFrameType +enum class VideoFrameType { - VIDEO_FRAME_TYPE_2D, + TWO_D, /** `True' 3D content, e.g. 3D DCPs */ - VIDEO_FRAME_TYPE_3D, - VIDEO_FRAME_TYPE_3D_LEFT_RIGHT, - VIDEO_FRAME_TYPE_3D_TOP_BOTTOM, - VIDEO_FRAME_TYPE_3D_ALTERNATE, + THREE_D, + THREE_D_LEFT_RIGHT, + THREE_D_TOP_BOTTOM, + THREE_D_ALTERNATE, /** This content is all the left frames of some 3D */ - VIDEO_FRAME_TYPE_3D_LEFT, + THREE_D_LEFT, /** This content is all the right frames of some 3D */ - VIDEO_FRAME_TYPE_3D_RIGHT + THREE_D_RIGHT }; std::string video_frame_type_to_string (VideoFrameType); VideoFrameType string_to_video_frame_type (std::string); -enum Eyes +enum class Eyes { - EYES_BOTH, - EYES_LEFT, - EYES_RIGHT, - EYES_COUNT + BOTH, + LEFT, + RIGHT, + COUNT }; -enum Part +enum class Part { - PART_LEFT_HALF, - PART_RIGHT_HALF, - PART_TOP_HALF, - PART_BOTTOM_HALF, - PART_WHOLE + LEFT_HALF, + RIGHT_HALF, + TOP_HALF, + BOTTOM_HALF, + WHOLE }; -enum ReelType +enum class ReelType { - REELTYPE_SINGLE, - REELTYPE_BY_VIDEO_CONTENT, - REELTYPE_BY_LENGTH + SINGLE, + BY_VIDEO_CONTENT, + BY_LENGTH }; -enum ChangeType + +enum class VideoRange { - CHANGE_TYPE_PENDING, - CHANGE_TYPE_DONE, - CHANGE_TYPE_CANCELLED + 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: @@ -149,22 +155,24 @@ enum ChangeType * There is some use of the word `subtitle' in the code which may mean * caption in some contexts. */ -enum TextType +enum class TextType { - TEXT_UNKNOWN, - TEXT_OPEN_SUBTITLE, - TEXT_CLOSED_CAPTION, - TEXT_COUNT + 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); -enum ExportFormat +enum class ExportFormat { - EXPORT_FORMAT_PRORES, - EXPORT_FORMAT_H264 + PRORES, + H264_AAC, + H264_PCM, + SUBTITLES_DCP }; /** @struct Crop @@ -174,7 +182,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); + explicit Crop (std::shared_ptr); /** Number of pixels to remove from the left-hand side */ int left; @@ -203,35 +211,65 @@ struct Crop void as_xml (xmlpp::Node *) const; }; +extern bool operator== (Crop const & a, Crop const & b); +extern bool operator!= (Crop const & a, Crop const & b); + struct CPLSummary { - CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f) + CPLSummary (boost::filesystem::path p); + + CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f, bool e, time_t t) : dcp_directory (d) , cpl_id (i) , cpl_annotation_text (a) , cpl_file (f) + , encrypted (e) + , last_write_time (t) {} std::string dcp_directory; std::string cpl_id; - std::string cpl_annotation_text; + boost::optional cpl_annotation_text; boost::filesystem::path cpl_file; + /** true if this CPL has any encrypted assets */ + bool encrypted; + time_t last_write_time; }; -extern bool operator== (Crop const & a, Crop const & b); -extern bool operator!= (Crop const & a, Crop const & b); - -enum Resolution { - RESOLUTION_2K, - RESOLUTION_4K +enum class Resolution { + TWO_K, + FOUR_K }; std::string resolution_to_string (Resolution); Resolution string_to_resolution (std::string); -enum Protocol { - PROTOCOL_SCP, - PROTOCOL_FTP +enum class FileTransferProtocol { + SCP, + FTP }; +enum class EmailProtocol { + AUTO, + PLAIN, + STARTTLS, + 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