_picture_asset.reset (
new libdcp::MonoPictureAsset (
_film->dir (_film->dcp_name()),
- "video.mxf",
+ _film->video_mxf_path(),
DCPFrameRate (_film->frames_per_second()).frames_per_second,
_film->format()->dcp_size()
)
lock.unlock ();
_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
shared_ptr<const EncodedData> encoded;
- if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
+ if (boost::filesystem::exists (_film->j2c_path (fetch, false))) {
/* It's an actual frame (not a repeat-last); load it in */
- encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
+ encoded.reset (new EncodedData (_film->j2c_path (fetch, false)));
}
lock.lock ();
_thread = 0;
_picture_asset_writer->finalize ();
- _sound_asset_writer->finalize ();
+
+ if (_sound_asset_writer) {
+ _sound_asset_writer->finalize ();
+ }
int const frames = _last_written_frame + 1;
int const duration = frames - _film->trim_start() - _film->trim_end();
_picture_asset->set_entry_point (_film->trim_start ());
_picture_asset->set_duration (duration);
- _sound_asset->set_entry_point (_film->trim_start ());
- _sound_asset->set_duration (duration);
+
+ if (_sound_asset) {
+ _sound_asset->set_entry_point (_film->trim_start ());
+ _sound_asset->set_duration (duration);
+ }
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
DCPFrameRate dfr (_film->frames_per_second ());