projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add DCPContent::resolution().
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 14840d5a678a1ba9c40d676687c2848501429ad1..50eed9aa1033debe460be604cfb4421a480c5461 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-45,8
+45,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
/** 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
/** A film of F seconds at f FPS will be Ff frames;
Consider some delta FPS d, so if we run the same
@@
-136,6
+139,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:
@@
-164,7
+173,9
@@
extern TextType string_to_text_type (std::string s);
enum ExportFormat
{
EXPORT_FORMAT_PRORES,
enum ExportFormat
{
EXPORT_FORMAT_PRORES,
- EXPORT_FORMAT_H264
+ EXPORT_FORMAT_H264_AAC,
+ EXPORT_FORMAT_H264_PCM,
+ EXPORT_FORMAT_SUBTITLES_DCP
};
/** @struct Crop
};
/** @struct Crop
@@
-236,9
+247,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