Move digest calculation to a separate method.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 81b77d5cea62a5219257368af0711660e69ccfcf..8fa9fbbca8b76893e913f63ac866ec5964095e42 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -393,6 +393,8 @@ void
 Writer::thread ()
 try
 {
+       start_of_thread ("Writer");
+
        while (true)
        {
                boost::mutex::scoped_lock lock (_state_mutex);
@@ -533,36 +535,9 @@ Writer::terminate_thread (bool can_throw)
 }
 
 
-/** @param output_dcp Path to DCP folder to write */
 void
-Writer::finish (boost::filesystem::path output_dcp)
+Writer::calculate_digests ()
 {
-       if (_thread.joinable()) {
-               LOG_GENERAL_NC ("Terminating writer thread");
-               terminate_thread (true);
-       }
-
-       LOG_GENERAL_NC ("Finishing ReelWriters");
-
-       for (auto& i: _reels) {
-               write_hanging_text (i);
-               i.finish (output_dcp);
-       }
-
-       LOG_GENERAL_NC ("Writing XML");
-
-       dcp::DCP dcp (output_dcp);
-
-       auto cpl = make_shared<dcp::CPL>(
-               film()->dcp_name(),
-               film()->dcp_content_type()->libdcp_kind(),
-               film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE
-               );
-
-       dcp.add (cpl);
-
-       /* Calculate digests for each reel in parallel */
-
        auto job = _job.lock ();
        if (job) {
                job->sub (_("Computing digests"));
@@ -573,7 +548,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 
        auto work = make_shared<boost::asio::io_service::work>(service);
 
-       int const threads = max (1, Config::instance()->master_encoding_threads ());
+       int const threads = max (1, Config::instance()->master_encoding_threads());
 
        for (int i = 0; i < threads; ++i) {
                pool.create_thread (boost::bind (&boost::asio::io_service::run, &service));
@@ -592,8 +567,44 @@ Writer::finish (boost::filesystem::path output_dcp)
        service.post (boost::bind (&Writer::calculate_referenced_digests, this, set_progress));
 
        work.reset ();
-       pool.join_all ();
+
+       {
+               pool.join_all ();
+       }
+
        service.stop ();
+}
+
+
+/** @param output_dcp Path to DCP folder to write */
+void
+Writer::finish (boost::filesystem::path output_dcp)
+{
+       if (_thread.joinable()) {
+               LOG_GENERAL_NC ("Terminating writer thread");
+               terminate_thread (true);
+       }
+
+       LOG_GENERAL_NC ("Finishing ReelWriters");
+
+       for (auto& i: _reels) {
+               write_hanging_text (i);
+               i.finish (output_dcp);
+       }
+
+       LOG_GENERAL_NC ("Writing XML");
+
+       dcp::DCP dcp (output_dcp);
+
+       auto cpl = make_shared<dcp::CPL>(
+               film()->dcp_name(),
+               film()->dcp_content_type()->libdcp_kind(),
+               film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE
+               );
+
+       dcp.add (cpl);
+
+       calculate_digests ();
 
        /* Add reels */