diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-16 02:46:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-16 02:46:46 +0100 |
| commit | ec0a74ffb64199847847cb4413380d5e3c24f617 (patch) | |
| tree | 021e37b318249fc91c9b4e5c3f7c218e807d0cfb /src/lib/make_dcp_job.cc | |
| parent | 4d3caea8b70b4a19c8aa80d626d52d4f95114f8e (diff) | |
Partial attempt at cleanup of naming straight vs DCI.
Diffstat (limited to 'src/lib/make_dcp_job.cc')
| -rw-r--r-- | src/lib/make_dcp_job.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc index b42a38429..efd35ba44 100644 --- a/src/lib/make_dcp_job.cc +++ b/src/lib/make_dcp_job.cc @@ -70,7 +70,7 @@ MakeDCPJob::wav_path (libdcp::Channel c) const void MakeDCPJob::run () { - string const dcp_path = _fs->dir (_fs->name); + string const dcp_path = _fs->dir (_fs->dcp_name()); /* Remove any old DCP */ filesystem::remove_all (dcp_path); @@ -85,17 +85,17 @@ MakeDCPJob::run () break; } - libdcp::DCP dcp (_fs->dir (_fs->name)); + libdcp::DCP dcp (_fs->dir (_fs->dcp_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))); + shared_ptr<libdcp::CPL> cpl (new libdcp::CPL (_fs->dir (_fs->dcp_name()), _fs->dcp_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 ( sigc::mem_fun (*this, &MakeDCPJob::j2c_path), - _fs->dir (_fs->name), + _fs->dir (_fs->dcp_name()), "video.mxf", &dcp.Progress, rint (_fs->frames_per_second), @@ -114,7 +114,7 @@ MakeDCPJob::run () sa.reset ( new libdcp::SoundAsset ( sigc::mem_fun (*this, &MakeDCPJob::wav_path), - _fs->dir (_fs->name), + _fs->dir (_fs->dcp_name()), "audio.mxf", &dcp.Progress, rint (_fs->frames_per_second), |