diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-21 09:23:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-22 10:30:45 +0100 |
| commit | e25bf0c33f4085f6caa3d0d19a083399a422146a (patch) | |
| tree | b7d1b00e2adf72540af8db29c5b68f406074b810 /src/lib/film.cc | |
| parent | 2c5398adaea8bc56fe196144a9a233981657fba0 (diff) | |
Remove ref_write mechanism and instead maintain state for each
reel being written so that we don't need to keep track of frames
that are being referenced.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 9f766a749..4a26ded3d 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -865,7 +865,7 @@ Film::set_isdcf_date_today () } boost::filesystem::path -Film::j2c_path (int f, Eyes e, bool t) const +Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const { boost::filesystem::path p; p /= "j2c"; @@ -873,17 +873,17 @@ Film::j2c_path (int f, Eyes e, bool t) const SafeStringStream s; s.width (8); - s << setfill('0') << f; + s << setfill('0') << reel << "_" << frame; - if (e == EYES_LEFT) { + if (eyes == EYES_LEFT) { s << ".L"; - } else if (e == EYES_RIGHT) { + } else if (eyes == EYES_RIGHT) { s << ".R"; } s << ".j2c"; - if (t) { + if (tmp) { s << ".tmp"; } |