Fix merge.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 85c913d0009cd0c0281a02890f1b31dc165b5bb8..5e8fb5b7a020bdf4be553d8bb65a005e80b5ac8f 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -22,7 +22,6 @@
 #include <libdcp/mono_picture_asset.h>
 #include <libdcp/stereo_picture_asset.h>
 #include <libdcp/sound_asset.h>
-#include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
 #include <libdcp/dcp.h>
 #include <libdcp/cpl.h>
@@ -75,21 +74,9 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
        */
 
        if (_film->three_d ()) {
-               _picture_asset.reset (
-                       new libdcp::StereoPictureAsset (
-                               _film->internal_video_mxf_dir (),
-                               _film->internal_video_mxf_filename ()
-                               )
-                       );
-               
+               _picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
        } else {
-               _picture_asset.reset (
-                       new libdcp::MonoPictureAsset (
-                               _film->internal_video_mxf_dir (),
-                               _film->internal_video_mxf_filename ()
-                               )
-                       );
-
+               _picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
        }
 
        _picture_asset->set_edit_rate (_film->video_frame_rate ());
@@ -101,13 +88,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
        
        _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
        
-       _sound_asset.reset (
-               new libdcp::SoundAsset (
-                       _film->dir (_film->dcp_name()),
-                       _film->audio_mxf_filename ()
-                       )
-               );
-
+       _sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _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 ());
@@ -414,7 +395,7 @@ Writer::finish ()
 
        libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
        meta.set_issue_date_now ();
-       dcp.write_xml (_film->interop (), meta);
+       dcp.write_xml (_film->interop (), meta, make_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));
 }