Use new channel 14 ATMOS sync creation code in libdcp,

and force films containing ATMOS to have 14 audio channels
and be SMPTE.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 1a9e552fe..cf7d04933 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1270,6 +1270,10 @@ Film::add_content (shared_ptr<Content> c)
 	_playlist->add (shared_from_this(), c);
 
 	maybe_set_container_and_resolution ();
+	if (c->atmos) {
+		set_audio_channels (14);
+		set_interop (false);
+	}
 }
 
 
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 133bc0adf..19b874f8a 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -170,7 +170,8 @@ ReelWriter::ReelWriter (
 		   of the DCP directory until the last minute.
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
-			_film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary)
+			_film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
+			_film->contains_atmos_content()
 			);
 	}
 }