X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=c185de0f4d74ffeef5b6df6cdec2299874db6c3f;hb=b7466a9653345bc51db4cb1d7e960bfc4c12721f;hp=201c74ec173ca3e3a241e07429000c0120d9c29c;hpb=8a28f2a3ddf8cdc4e7e27b875cd7f5178b9dc555;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 201c74ec1..c185de0f4 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -74,9 +74,9 @@ using boost::shared_ptr;
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<Image> yuv, shared_ptr<Subtitle> sub,
+	shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
 	Size out, int p, int subtitle_offset, float subtitle_scale,
-	Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l
+	Scaler const * s, SourceFrame f, float fps, string pp, int clut, int bw, Log* l
 	)
 	: _input (yuv)
 	, _subtitle (sub)
@@ -86,8 +86,7 @@ DCPVideoFrame::DCPVideoFrame (
 	, _subtitle_scale (subtitle_scale)
 	, _scaler (s)
 	, _frame (f)
-	  /* we round here; not sure if this is right */
-	, _frames_per_second (rint (fps))
+	, _frames_per_second (dcp_frame_rate(fps).frames_per_second)
 	, _post_process (pp)
 	, _colour_lut_index (clut)
 	, _j2k_bandwidth (bw)
@@ -377,7 +376,7 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
  *  @param frame Frame index.
  */
 void
-EncodedData::write (shared_ptr<const Options> opt, int frame)
+EncodedData::write (shared_ptr<const Options> opt, SourceFrame frame)
 {
 	string const tmp_j2k = opt->frame_out_path (frame, true);