diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-14 23:41:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-14 23:41:57 +0100 |
| commit | 9fcaaf1cc7582598b06f5a43878cbd9aa2b4ff17 (patch) | |
| tree | 2f596a2e2f977d303a10025f48e4da1a9c3c0fd3 /src/lib/writer.cc | |
| parent | ea7b50b1b1f42e3a722f2efdca6fa2c3184d2105 (diff) | |
Add Trimmer class; not linked in.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index c6ce4711d..ad81686d1 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -259,9 +259,14 @@ Writer::finish () } int const frames = _last_written_frame + 1; - int const duration = frames - _film->trim_start() - _film->trim_end(); + int duration = 0; + if (_film->trim_type() == Film::CPL) { + duration = frames - _film->trim_start() - _film->trim_end(); + _picture_asset->set_entry_point (_film->trim_start ()); + } else { + duration = frames; + } - _picture_asset->set_entry_point (_film->trim_start ()); _picture_asset->set_duration (duration); /* Hard-link the video MXF into the DCP */ @@ -288,7 +293,9 @@ Writer::finish () _picture_asset->set_file_name (_film->dcp_video_mxf_filename ()); if (_sound_asset) { - _sound_asset->set_entry_point (_film->trim_start ()); + if (_film->trim_type() == Film::CPL) { + _sound_asset->set_entry_point (_film->trim_start ()); + } _sound_asset->set_duration (duration); } |