projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: fix encryption of files encoded from DCP.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 3c9a8025b1a39a5006982a021ec5502e12f25e72..c9f68a21cdf67d6e5e32c7f44d2ad76ff8f8fff5 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-136,6
+136,12
@@
enum ChangeType
CHANGE_TYPE_CANCELLED
};
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:
@@
-203,16
+209,20
@@
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
{
CPLSummary (boost::filesystem::path p);
struct CPLSummary
{
CPLSummary (boost::filesystem::path p);
- CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f, bool e)
+ 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)
: 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 dcp_directory;
@@
-221,11
+231,9
@@
struct CPLSummary
boost::filesystem::path cpl_file;
/** true if this CPL has any encrypted assets */
bool encrypted;
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
@@
-234,9
+242,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