From 9f047a1db33a1beeab4099d91fc52da4b0cdd92d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Jun 2015 14:46:50 +0100 Subject: Subtitle naming fixes. --- src/lib/writer.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/lib/writer.cc') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 9e2cf4bd4..7e47c317e 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -524,9 +524,15 @@ Writer::finish () _subtitle_asset->add_font (i->id, i->file.get_value_or (liberation)); } - _subtitle_asset->write ( - _film->dir (_film->dcp_name ()) / _subtitle_asset->id () / subtitle_content_filename (_subtitle_asset) - ); + if (dynamic_pointer_cast (_subtitle_asset)) { + boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id (); + boost::filesystem::create_directories (directory); + _subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml")); + } else { + _subtitle_asset->write ( + _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") + ); + } reel->add (shared_ptr ( new dcp::ReelSubtitleAsset ( -- cgit v1.2.3