summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-09-10 15:15:10 +0100
committerCarl Hetherington <cth@carlh.net>2012-09-10 15:15:10 +0100
commit677c1df8fb6cad316a51d074d819be39a3b279ee (patch)
tree8dfe8dbcc631720372aa15557fa451a3d1e9816f /src/lib
parent330879b3555317a20ffe6cad2a489a8adac2c77a (diff)
Update for newer libdcp.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/make_dcp_job.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index 525f76c0e..8d3547cae 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -87,9 +87,12 @@ MakeDCPJob::run ()
break;
}
- libdcp::DCP dcp (_fs->dir (_fs->name), _fs->name, _fs->dcp_content_type->libdcp_kind (), rint (_fs->frames_per_second), frames);
+ libdcp::DCP dcp (_fs->dir (_fs->name));
dcp.Progress.connect (sigc::mem_fun (*this, &MakeDCPJob::dcp_progress));
+ shared_ptr<libdcp::CPL> cpl (new libdcp::CPL (_fs->dir (_fs->name), _fs->name, _fs->dcp_content_type->libdcp_kind (), frames, rint (_fs->frames_per_second)));
+ dcp.add_cpl (cpl);
+
descend (0.9);
shared_ptr<libdcp::MonoPictureAsset> pa (
new libdcp::MonoPictureAsset (
@@ -124,7 +127,7 @@ MakeDCPJob::run ()
ascend ();
}
- dcp.add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
+ cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
dcp.write_xml ();
set_progress (1);