Fix some coverity-reported stuff.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b93a26bb05d9340afefe23c43dc5251bf6421745..42187dc6e78616a24673057bb4e9eb87802381aa 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -45,6 +45,7 @@ using std::pair;
 using std::string;
 using std::list;
 using std::cout;
+using std::stringstream;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
@@ -86,37 +87,27 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 
        _picture_asset->set_edit_rate (_film->video_frame_rate ());
        _picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ()));
+       _picture_asset->set_interop (_film->interop ());
 
        if (_film->encrypted ()) {
                _picture_asset->set_key (_film->key ());
        }
        
-       /* Write the sound asset into the film directory so that we leave the creation
-          of the DCP directory until the last minute.  Some versions of windows inexplicably
-          don't like overwriting existing files here, so try to remove it using boost.
-       */
-       boost::system::error_code ec;
-       boost::filesystem::remove_all (_film->file (_film->audio_mxf_filename ()), ec);
-       if (ec) {
-               _film->log()->log (
-                       String::compose (
-                               "Could not remove existing audio MXF file %1 (%2)",
-                               _film->file (_film->audio_mxf_filename ()),
-                               ec.value ())
-                       );
-       }
-
        _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
        _sound_asset.reset (new libdcp::SoundAsset (_film->directory (), _film->audio_mxf_filename ()));
        _sound_asset->set_edit_rate (_film->video_frame_rate ());
        _sound_asset->set_channels (_film->audio_channels ());
        _sound_asset->set_sampling_rate (_film->audio_frame_rate ());
+       _sound_asset->set_interop (_film->interop ());
 
        if (_film->encrypted ()) {
                _sound_asset->set_key (_film->key ());
        }
        
+       /* Write the sound asset into the film directory so that we leave the creation
+          of the DCP directory until the last minute.
+       */
        _sound_asset_writer = _sound_asset->start_write ();
 
        _thread = new boost::thread (boost::bind (&Writer::thread, this));
@@ -124,6 +115,11 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
        job->sub (_("Encoding image data"));
 }
 
+Writer::~Writer ()
+{
+       terminate_thread (false);
+}
+
 void
 Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
 {
@@ -337,6 +333,8 @@ try
                        qi.encoded.reset ();
                        --_queued_full_in_memory;
                }
+
+               _full_condition.notify_all ();
        }
 }
 catch (...)
@@ -345,23 +343,35 @@ catch (...)
 }
 
 void
-Writer::finish ()
+Writer::terminate_thread (bool can_throw)
 {
-       if (!_thread) {
+       boost::mutex::scoped_lock lock (_mutex);
+       if (_thread == 0) {
                return;
        }
        
-       boost::mutex::scoped_lock lock (_mutex);
        _finish = true;
        _empty_condition.notify_all ();
        _full_condition.notify_all ();
        lock.unlock ();
 
-       _thread->join ();
-       rethrow ();
+       _thread->join ();
+       if (can_throw) {
+               rethrow ();
+       }
        
        delete _thread;
        _thread = 0;
+}      
+
+void
+Writer::finish ()
+{
+       if (!_thread) {
+               return;
+       }
+       
+       terminate_thread (true);
 
        _picture_asset_writer->finalize ();
        _sound_asset_writer->finalize ();
@@ -531,7 +541,9 @@ Writer::check_existing_picture_mxf ()
                shared_ptr<Job> job = _job.lock ();
                assert (job);
 
-               job->set_progress (float (_first_nonexistant_frame) / N);
+               if (N > 0) {
+                       job->set_progress (float (_first_nonexistant_frame) / N);
+               }
 
                if (_film->three_d ()) {
                        if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {