Remove uses of boost::system::error_code::message(), which seem to cause the pure...

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d7f3512cbf033809c4604b50a6eb824f8a0001d8..414ea72ebb47425e55e9d4719e9819c453985b16 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -36,20 +36,21 @@
 #include "audio_mapping.h"
 #include "config.h"
 #include "job.h"
+#include "cross.h"
 
 #include "i18n.h"
 
 using std::make_pair;
 using std::pair;
 using std::string;
-using std::ifstream;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::weak_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
+Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
        : _film (f)
        , _job (j)
        , _first_nonexistant_frame (0)
@@ -66,7 +67,10 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
        /* Remove any old DCP */
        boost::filesystem::remove_all (_film->dir (_film->dcp_name ()));
 
-       _job->sub (_("Checking existing image data"));
+       shared_ptr<Job> job = _job.lock ();
+       assert (job);
+
+       job->sub (_("Checking existing image data"));
        check_existing_picture_mxf ();
 
        /* Create our picture asset in a subdirectory, named according to those
@@ -102,7 +106,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 
        _thread = new boost::thread (boost::bind (&Writer::thread, this));
 
-       _job->sub (_("Encoding image data"));
+       job->sub (_("Encoding image data"));
 }
 
 void
@@ -137,8 +141,9 @@ Writer::fake_write (int frame, Eyes eyes)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
-       ifstream ifi (_film->info_path (frame, eyes).string().c_str());
+       FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
        libdcp::FrameInfo info (ifi);
+       fclose (ifi);
        
        QueueItem qi;
        qi.type = QueueItem::FAKE;
@@ -267,9 +272,16 @@ try
                        _last_written_eyes = qi.eyes;
                        
                        if (_film->length()) {
-                               _job->set_progress (
-                                       float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
-                                       );
+                               shared_ptr<Job> job = _job.lock ();
+                               assert (job);
+                               int total = _film->time_to_video_frames (_film->length ());
+                               if (_film->three_d ()) {
+                                       /* _full_written and so on are incremented for each eye, so we need to double the total
+                                          frames to get the correct progress.
+                                       */
+                                       total *= 2;
+                               }
+                               job->set_progress (float (_full_written + _fake_written + _repeat_written) / total);
                        }
                }
 
@@ -323,9 +335,7 @@ Writer::finish ()
        lock.unlock ();
 
        _thread->join ();
-       if (thrown ()) {
-               rethrow ();
-       }
+       rethrow ();
        
        delete _thread;
        _thread = 0;
@@ -382,15 +392,18 @@ Writer::finish ()
                                                         )
                               ));
 
-       _job->sub (_("Computing image digest"));
-       _picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+       shared_ptr<Job> job = _job.lock ();
+       assert (job);
+
+       job->sub (_("Computing image digest"));
+       _picture_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false));
 
-       _job->sub (_("Computing audio digest"));
-       _sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+       job->sub (_("Computing audio digest"));
+       _sound_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false));
 
        libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
        meta.set_issue_date_now ();
-       dcp.write_xml (_film->interop (), meta, make_signer ());
+       dcp.write_xml (_film->interop (), meta, _film->is_signed() ? make_signer () : shared_ptr<const libdcp::Signer> ());
 
        _film->log()->log (String::compose (N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk));
 }
@@ -421,8 +434,14 @@ bool
 Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 {
        /* Read the frame info as written */
-       ifstream ifi (_film->info_path (f, eyes).string().c_str());
+       FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
+       if (!ifi) {
+               _film->log()->log (String::compose ("Existing frame %1 has no info file", f));
+               return false;
+       }
+       
        libdcp::FrameInfo info (ifi);
+       fclose (ifi);
        if (info.size == 0) {
                _film->log()->log (String::compose ("Existing frame %1 has no info file", f));
                return false;
@@ -457,7 +476,7 @@ Writer::check_existing_picture_mxf ()
        boost::filesystem::path p;
        p /= _film->internal_video_mxf_dir ();
        p /= _film->internal_video_mxf_filename ();
-       FILE* mxf = fopen (p.string().c_str(), "rb");
+       FILE* mxf = fopen_boost (p, "rb");
        if (!mxf) {
                _film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno));
                return;
@@ -470,7 +489,10 @@ Writer::check_existing_picture_mxf ()
 
        while (1) {
 
-               _job->set_progress (float (_first_nonexistant_frame) / N);
+               shared_ptr<Job> job = _job.lock ();
+               assert (job);
+
+               job->set_progress (float (_first_nonexistant_frame) / N);
 
                if (_film->three_d ()) {
                        if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {