diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-10 15:15:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-10 15:15:10 +0100 |
| commit | 677c1df8fb6cad316a51d074d819be39a3b279ee (patch) | |
| tree | 8dfe8dbcc631720372aa15557fa451a3d1e9816f | |
| parent | 330879b3555317a20ffe6cad2a489a8adac2c77a (diff) | |
Update for newer libdcp.
| -rw-r--r-- | src/lib/make_dcp_job.cc | 7 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 6 insertions, 3 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); @@ -60,7 +60,7 @@ def configure(conf): conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True) conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.11', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.20', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF') |