projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another macOS std::list boost::thread SNAFU.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 42e2e3eecd2c8d6801e3b6563ecdcf53a5b116d4..5a8b650b8808d753223e0e1dff6c39ba3d45fafc 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-129,6
+129,19
@@
enum ReelType
REELTYPE_BY_LENGTH
};
REELTYPE_BY_LENGTH
};
+enum ChangeType
+{
+ CHANGE_TYPE_PENDING,
+ CHANGE_TYPE_DONE,
+ 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)
+};
+
/** Type of captions.
*
* The generally accepted definitions seem to be:
/** Type of captions.
*
* The generally accepted definitions seem to be:
@@
-154,6
+167,14
@@
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_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.
*/
@@
-190,24
+211,31
@@
struct Crop
void as_xml (xmlpp::Node *) const;
};
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
{
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)
: 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::filesystem::path cpl_file;
{}
std::string dcp_directory;
std::string cpl_id;
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;
};
};
-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 Resolution {
RESOLUTION_2K,
RESOLUTION_4K
@@
-216,9
+244,16
@@
enum Resolution {
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 Protocol {
- PROTOCOL_SCP,
- PROTOCOL_FTP
+enum FileTransferProtocol {
+ FILE_TRANSFER_PROTOCOL_SCP,
+ FILE_TRANSFER_PROTOCOL_FTP
+};
+
+enum EmailProtocol {
+ EMAIL_PROTOCOL_AUTO,
+ EMAIL_PROTOCOL_PLAIN,
+ EMAIL_PROTOCOL_STARTTLS,
+ EMAIL_PROTOCOL_SSL
};
#endif
};
#endif