Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/types.h b/src/lib/types.h
index 3c9a8025b1a39a5006982a021ec5502e12f25e72..94e101a3d682a43127eec28667c54bbe1ffb24bc 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -203,16 +203,20 @@ struct Crop
        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);
 
-       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)
+               , last_write_time (t)
        {}
 
        std::string dcp_directory;
@@ -221,11 +225,9 @@ struct CPLSummary
        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
@@ -234,9 +236,16 @@ enum Resolution {
 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