Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / send_problem_report_job.cc

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 3c0bc47aac58fba1fc5d87d4a108702c99b91528..11f700de077490751550913257e8991df05f4d8a 100644 (file)
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,6 +27,7 @@
 #include "version.h"
 #include "emailer.h"
 #include "environment_info.h"
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
@@ -35,7 +36,10 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
-/** @param film Film thta the problem is with, or 0 */
+/** @param film Film thta the problem is with, or 0.
+ *  @param from Email address to use for From:
+ *  @param summary Summary of the problem.
+ */
 SendProblemReportJob::SendProblemReportJob (
        shared_ptr<const Film> film,
        string from,
@@ -87,14 +91,17 @@ SendProblemReportJob::run ()
                body += "---<8----\n\n";
 
                add_file (body, "ffprobe.log");
-               add_file (body, "metadata.xml");
+
+               body += "---<8----\n";
+               body += _film->metadata()->write_to_string_formatted("UTF-8");
+               body += "---<8----\n";
        }
 
        list<string> to;
        to.push_back ("carl@dcpomatic.com");
 
        Emailer emailer (_from, to, "DCP-o-matic problem report", body);
-       emailer.send ("main.carlh.net", 2525);
+       emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
 
        set_progress (1);
        set_state (FINISHED_OK);