X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=5f5dae98f31c24a3181718fdf880d88ad843208e;hb=127672223cca569986e35c91265e269ed5a6561c;hp=06acaa1f63109162c53521a55c513396f2096e39;hpb=2bde54c29e6b36c75948ca1d3efcda0535d148d7;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 06acaa1f6..5f5dae98f 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -28,6 +28,7 @@
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -41,8 +42,9 @@ using boost::shared_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<Film> f)
+Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
 	: _film (f)
+	, _playlist (p)
 	, _first_nonexistant_frame (0)
 	, _thread (0)
 	, _finish (false)
@@ -74,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_film->audio_channels ());
+	AudioMapping m (_playlist->audio_channels ());
 	
 	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
@@ -83,7 +85,7 @@ Writer::Writer (shared_ptr<Film> f)
 				N_("audio.mxf"),
 				_film->dcp_frame_rate (),
 				m.dcp_channels (),
-				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
+				dcp_audio_sample_rate (_playlist->audio_frame_rate())
 				)
 			);
 
@@ -273,8 +275,14 @@ Writer::finish ()
 	boost::filesystem::path to;
 	to /= _film->dir (_film->dcp_name());
 	to /= N_("video.mxf");
-	
-	boost::filesystem::create_hard_link (from, to);
+
+	boost::system::error_code ec;
+	boost::filesystem::create_hard_link (from, to, ec);
+	if (ec) {
+		/* hard link failed; copy instead */
+		boost::filesystem::copy_file (from, to);
+		_film->log()->log ("Hard-link failed; fell back to copying");
+	}
 
 	/* And update the asset */