diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-17 00:10:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-17 00:10:12 +0000 |
| commit | f35b2a637ba82e39eb81e030c2e112185349cac5 (patch) | |
| tree | 2e09d1e11ad90d5f7c5ce425295c3d2e51054cfd /src/lib/dcp_video_frame.cc | |
| parent | d87ea0504297c0bb6bd3bd192588d0f3e927fee9 (diff) | |
EncodeOptions can go.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
| -rw-r--r-- | src/lib/dcp_video_frame.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index f6fb8fe2e..c00ed9b88 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -376,9 +376,9 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) * @param frame Frame index. */ void -EncodedData::write (shared_ptr<const EncodeOptions> opt, SourceFrame frame) +EncodedData::write (shared_ptr<const Film> film, SourceFrame frame) { - string const tmp_j2k = opt->frame_out_path (frame, true); + string const tmp_j2k = film->frame_out_path (frame, true); FILE* f = fopen (tmp_j2k.c_str (), "wb"); @@ -389,13 +389,13 @@ EncodedData::write (shared_ptr<const EncodeOptions> opt, SourceFrame frame) fwrite (_data, 1, _size, f); fclose (f); - string const real_j2k = opt->frame_out_path (frame, false); + string const real_j2k = film->frame_out_path (frame, false); /* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */ boost::filesystem::rename (tmp_j2k, real_j2k); /* Write a file containing the hash */ - string const hash = opt->hash_out_path (frame, false); + string const hash = film->hash_out_path (frame, false); ofstream h (hash.c_str()); h << md5_digest (_data, _size) << "\n"; h.close (); |
