summaryrefslogtreecommitdiff
path: root/src/lib/writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-01 21:35:41 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-01 21:35:41 +0000
commit6a516da9a403ce05b2b78b3cf1376f4dfe4be3fe (patch)
tree7c5307ceefa5a6fc6a11d39bbfb2deca0e29758d /src/lib/writer.cc
parentdd7cf1ef6e860243b80f4c47a99393244f63a3d5 (diff)
Make film hold its DCP frame rate.
Diffstat (limited to 'src/lib/writer.cc')
-rw-r--r--src/lib/writer.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 334ecec65..5a2f7c9a9 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -67,8 +67,8 @@ Writer::Writer (shared_ptr<Film> f)
new libdcp::MonoPictureAsset (
_film->video_mxf_dir (),
_film->video_mxf_filename (),
- DCPFrameRate (_film->frames_per_second()).frames_per_second,
- _film->format()->dcp_size()
+ _film->dcp_frame_rate (),
+ _film->format()->dcp_size ()
)
);
@@ -81,7 +81,7 @@ Writer::Writer (shared_ptr<Film> f)
new libdcp::SoundAsset (
_film->dir (_film->dcp_name()),
N_("audio.mxf"),
- DCPFrameRate (_film->frames_per_second()).frames_per_second,
+ _film->dcp_frame_rate (),
m.dcp_channels (),
dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
)
@@ -289,10 +289,15 @@ Writer::finish ()
}
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
- DCPFrameRate dfr (_film->frames_per_second ());
shared_ptr<libdcp::CPL> cpl (
- new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, dfr.frames_per_second)
+ new libdcp::CPL (
+ _film->dir (_film->dcp_name()),
+ _film->dcp_name(),
+ _film->dcp_content_type()->libdcp_kind (),
+ frames,
+ _film->dcp_frame_rate ()
+ )
);
dcp.add_cpl (cpl);