KDM / libdcp API changes.

1 files changed, 14 insertions, 31 deletions

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 37376ca23..caa37c211 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,12 +19,13 @@
 
 #include <fstream>
 #include <cerrno>
-#include <libdcp/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>
+#include <libdcp/mono_picture_asset.h>
+#include <libdcp/stereo_picture_asset.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
@@ -74,48 +75,30 @@ 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 (),
-				_film->video_frame_rate (),
-				_film->container()->size (_film->full_frame ())
-				)
-			);
-		
+		_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 (),
-				_film->video_frame_rate (),
-				_film->container()->size (_film->full_frame ())
-				)
-			);
-
+		_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 ());
+	_picture_asset->set_size (_film->container()->size (_film->full_frame ()));
+
 	if (_film->encrypted ()) {
 		_picture_asset->set_key (_film->key ());
 	}
 	
-	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0, _film->interop ());
+	_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 (),
-			_film->video_frame_rate (),
-			_film->audio_channels (),
-			_film->audio_frame_rate ()
-			)
-		);
+	_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 ());
 
 	if (_film->encrypted ()) {
 		_sound_asset->set_key (_film->key ());
 	}
 	
-	_sound_asset_writer = _sound_asset->start_write (_film->interop ());
+	_sound_asset_writer = _sound_asset->start_write ();
 
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 
@@ -413,7 +396,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));
 }