X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=d742818ae08849bfe81e191c3f922deb01a3b6c0;hb=4a5fcd19ca16447ba8b204986a378072a9c730b2;hp=692134654a84b3301f40ec02fbae8660b19cc852;hpb=92984df6ab50ba4ec90d105e44b58efa863c4b59;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 692134654..d742818ae 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -112,11 +112,13 @@ ReelWriter::ReelWriter (
 			_sound_asset->set_key (_film->key ());
 		}
 
+		DCPOMATIC_ASSERT (_film->directory());
+
 		/* Write the sound asset into the film directory so that we leave the creation
 		   of the DCP directory until the last minute.
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
-			_film->directory() / 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->interop() ? dcp::INTEROP : dcp::SMPTE
 			);
 	}
@@ -489,7 +491,7 @@ ReelWriter::write (PlayerSubtitles subs)
 		}
 	}
 
-	BOOST_FOREACH (dcp::SubtitleString i, subs.text) {
+	BOOST_FOREACH (SubtitleString i, subs.text) {
 		i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
 		i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
 		_subtitle_asset->add (i);