C++11 tidying.

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

diff --git a/src/lib/types.h b/src/lib/types.h
index a10b26a6384fb355704920e43fd2fdf40d60fec5..6fbad21883084da078dcc7ed09d7c78d51921922 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,7 +24,6 @@
 #include "position.h"
 #include "rect.h"
 #include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 #include <stdint.h>
 
@@ -86,64 +85,57 @@ 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;
 
-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
-};
-
-enum ChangeType
-{
-       CHANGE_TYPE_PENDING,
-       CHANGE_TYPE_DONE,
-       CHANGE_TYPE_CANCELLED
+       SINGLE,
+       BY_VIDEO_CONTENT,
+       BY_LENGTH
 };
 
 
-enum VideoRange
+enum class VideoRange
 {
-       VIDEO_RANGE_FULL, ///< full,  or "JPEG" (0-255 for 8-bit)
-       VIDEO_RANGE_VIDEO ///< video, or "MPEG" (16-235 for 8-bit)
+       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);
@@ -163,24 +155,24 @@ extern VideoRange string_to_video_range (std::string s);
  *  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_AAC,
-       EXPORT_FORMAT_H264_PCM,
-       EXPORT_FORMAT_SUBTITLES_DCP
+       PRORES,
+       H264_AAC,
+       H264_PCM,
+       SUBTITLES_DCP
 };
 
 /** @struct Crop
@@ -190,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<cxml::Node>);
+       explicit Crop (std::shared_ptr<cxml::Node>);
 
        /** Number of pixels to remove from the left-hand side */
        int left;
@@ -237,31 +229,31 @@ 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;
        time_t last_write_time;
 };
 
-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 FileTransferProtocol {
-       FILE_TRANSFER_PROTOCOL_SCP,
-       FILE_TRANSFER_PROTOCOL_FTP
+enum class FileTransferProtocol {
+       SCP,
+       FTP
 };
 
-enum EmailProtocol {
-       EMAIL_PROTOCOL_AUTO,
-       EMAIL_PROTOCOL_PLAIN,
-       EMAIL_PROTOCOL_STARTTLS,
-       EMAIL_PROTOCOL_SSL
+enum class EmailProtocol {
+       AUTO,
+       PLAIN,
+       STARTTLS,
+       SSL
 };