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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 177e929ae..b545848cb 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -22,6 +22,7 @@
 #include <libdcp/sound_asset.h>
 #include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
+#include <libdcp/dcp.h>
 #include <libdcp/cpl.h>
 #include "writer.h"
 #include "compose.hpp"
@@ -29,6 +30,9 @@
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
+#include "dcp_content_type.h"
+#include "player.h"
+#include "audio_mapping.h"
 #include "config.h"
 
 #include "i18n.h"
@@ -76,16 +80,14 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_film->audio_channels ());
-	
-	if (m.dcp_channels() > 0) {
+	if (_film->audio_channels() > 0) {
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
 				_film->dcp_audio_mxf_filename (),
 				_film->dcp_frame_rate (),
-				m.dcp_channels (),
-				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
+				_film->audio_mapping().dcp_channels (),
+				dcp_audio_sample_rate (_film->audio_frame_rate())
 				)
 			);