projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index f8f23a300c87d2dc5a38ac6b27306e4724653b08..f2a79b2fdcbd879c25f7484ec918afc1d8130f95 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-85,64
+85,57
@@
namespace xmlpp {
/** Port on which player listens for play requests */
#define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5)
/** Port on which player listens for play requests */
#define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5)
-typedef std::vector<std::shared_ptr<Content>
> ContentList;
-typedef std::vector<std::shared_ptr<FFmpegContent>
> FFmpegContentList;
+typedef std::vector<std::shared_ptr<Content>> ContentList;
+typedef std::vector<std::shared_ptr<FFmpegContent>> FFmpegContentList;
typedef int64_t Frame;
typedef int64_t Frame;
-enum VideoFrameType
+enum
class
VideoFrameType
{
{
-
VIDEO_FRAME_TYPE_2
D,
+
TWO_
D,
/** `True' 3D content, e.g. 3D DCPs */
/** `True' 3D content, e.g. 3D DCPs */
-
VIDEO_FRAME_TYPE_3
D,
-
VIDEO_FRAME_TYPE_3
D_LEFT_RIGHT,
-
VIDEO_FRAME_TYPE_3
D_TOP_BOTTOM,
-
VIDEO_FRAME_TYPE_3
D_ALTERNATE,
+
THREE_
D,
+
THREE_
D_LEFT_RIGHT,
+
THREE_
D_TOP_BOTTOM,
+
THREE_
D_ALTERNATE,
/** This content is all the left frames of some 3D */
/** This content is all the left frames of some 3D */
-
VIDEO_FRAME_TYPE_3
D_LEFT,
+
THREE_
D_LEFT,
/** This content is all the right frames of some 3D */
/** This content is all the right frames of some 3D */
-
VIDEO_FRAME_TYPE_3
D_RIGHT
+
THREE_
D_RIGHT
};
std::string video_frame_type_to_string (VideoFrameType);
VideoFrameType string_to_video_frame_type (std::string);
};
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);
};
extern std::string video_range_to_string (VideoRange r);
@@
-162,26
+155,18
@@
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.
*/
* 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);
};
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
-{
- EXPORT_FORMAT_PRORES,
- EXPORT_FORMAT_H264_AAC,
- EXPORT_FORMAT_H264_PCM,
- EXPORT_FORMAT_SUBTITLES_DCP
-};
-
/** @struct Crop
* @brief A description of the crop of an image or video.
*/
/** @struct Crop
* @brief A description of the crop of an image or video.
*/
@@
-243,24
+228,24
@@
struct CPLSummary
time_t last_write_time;
};
time_t last_write_time;
};
-enum Resolution {
-
RESOLUTION_2
K,
-
RESOLUTION_4
K
+enum
class
Resolution {
+
TWO_
K,
+
FOUR_
K
};
std::string resolution_to_string (Resolution);
Resolution string_to_resolution (std::string);
};
std::string resolution_to_string (Resolution);
Resolution string_to_resolution (std::string);
-enum FileTransferProtocol {
-
FILE_TRANSFER_PROTOCOL_
SCP,
- F
ILE_TRANSFER_PROTOCOL_F
TP
+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
};
};