X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=177e929aebf2e64c989f0d4146ace0e0c296f82a;hb=c7cde950031d48482a841c987be38b9193bdd08a;hp=2d7ee9ba317f32d1246142064b09890bb25cadb5;hpb=2f7180555f2d8b727bde21613fc2474bb4f7664c;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2d7ee9ba3..177e929ae 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -22,12 +22,14 @@
 #include <libdcp/sound_asset.h>
 #include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
+#include <libdcp/cpl.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
+#include "config.h"
 
 #include "i18n.h"
 
@@ -65,8 +67,8 @@ Writer::Writer (shared_ptr<Film> f)
 	
 	_picture_asset.reset (
 		new libdcp::MonoPictureAsset (
-			_film->video_mxf_dir (),
-			_film->video_mxf_filename (),
+			_film->internal_video_mxf_dir (),
+			_film->internal_video_mxf_filename (),
 			_film->dcp_frame_rate (),
 			_film->format()->dcp_size ()
 			)
@@ -80,7 +82,7 @@ Writer::Writer (shared_ptr<Film> f)
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
-				N_("audio.mxf"),
+				_film->dcp_audio_mxf_filename (),
 				_film->dcp_frame_rate (),
 				m.dcp_channels (),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
@@ -259,20 +261,25 @@ Writer::finish ()
 	}
 
 	int const frames = _last_written_frame + 1;
-	int const duration = frames - _film->trim_start() - _film->trim_end();
+	int duration = 0;
+	if (_film->trim_type() == Film::CPL) {
+		duration = frames - _film->trim_start() - _film->trim_end();
+		_picture_asset->set_entry_point (_film->trim_start ());
+	} else {
+		duration = frames;
+	}
 	
-	_picture_asset->set_entry_point (_film->trim_start ());
 	_picture_asset->set_duration (duration);
 
 	/* Hard-link the video MXF into the DCP */
 
 	boost::filesystem::path from;
-	from /= _film->video_mxf_dir();
-	from /= _film->video_mxf_filename();
+	from /= _film->internal_video_mxf_dir();
+	from /= _film->internal_video_mxf_filename();
 	
 	boost::filesystem::path to;
 	to /= _film->dir (_film->dcp_name());
-	to /= N_("video.mxf");
+	to /= _film->dcp_video_mxf_filename ();
 
 	boost::system::error_code ec;
 	boost::filesystem::create_hard_link (from, to, ec);
@@ -285,10 +292,12 @@ Writer::finish ()
 	/* And update the asset */
 
 	_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
-	_picture_asset->set_file_name (N_("video.mxf"));
+	_picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
 
 	if (_sound_asset) {
-		_sound_asset->set_entry_point (_film->trim_start ());
+		if (_film->trim_type() == Film::CPL) {
+			_sound_asset->set_entry_point (_film->trim_start ());
+		}
 		_sound_asset->set_duration (duration);
 	}
 	
@@ -313,7 +322,9 @@ Writer::finish ()
 							 )
 			       ));
 
-	dcp.write_xml ();
+	libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
+	meta.set_issue_date_now ();
+	dcp.write_xml (meta);
 
 	_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));
 }
@@ -339,8 +350,8 @@ Writer::check_existing_picture_mxf ()
 {
 	/* Try to open the existing MXF */
 	boost::filesystem::path p;
-	p /= _film->video_mxf_dir ();
-	p /= _film->video_mxf_filename ();
+	p /= _film->internal_video_mxf_dir ();
+	p /= _film->internal_video_mxf_filename ();
 	FILE* mxf = fopen (p.string().c_str(), N_("rb"));
 	if (!mxf) {
 		return;