diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
| commit | d6e74fb7dbc5b01c9ce42f8fe780bb16262d13b1 (patch) | |
| tree | 85ec43c83ad755843e6009f29a01edbe4985b5c0 /src/lib/j2k_still_encoder.cc | |
| parent | 988fa33f7d25f2f3319442ce3c9ed661172e4d56 (diff) | |
Re-work FilmState / Film relationship a bit; Film now inherits from FilmState and FilmState does get/set.
Diffstat (limited to 'src/lib/j2k_still_encoder.cc')
| -rw-r--r-- | src/lib/j2k_still_encoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/j2k_still_encoder.cc b/src/lib/j2k_still_encoder.cc index 2b8aca649..de2f1eb46 100644 --- a/src/lib/j2k_still_encoder.cc +++ b/src/lib/j2k_still_encoder.cc @@ -50,9 +50,9 @@ J2KStillEncoder::J2KStillEncoder (shared_ptr<const FilmState> s, shared_ptr<cons void J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Subtitle> sub) { - pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters); + pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters()); DCPVideoFrame* f = new DCPVideoFrame ( - yuv, sub, _opt->out_size, _opt->padding, _fs->subtitle_offset, _fs->subtitle_scale, _fs->scaler, 0, _fs->frames_per_second, s.second, + yuv, sub, _opt->out_size, _opt->padding, _fs->subtitle_offset(), _fs->subtitle_scale(), _fs->scaler(), 0, _fs->frames_per_second(), s.second, Config::instance()->colour_lut_index(), Config::instance()->j2k_bandwidth(), _log ); @@ -63,7 +63,7 @@ J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Sub } string const real = _opt->frame_out_path (0, false); - for (int i = 1; i < (_fs->still_duration * ImageMagickDecoder::static_frames_per_second()); ++i) { + for (int i = 1; i < (_fs->still_duration() * ImageMagickDecoder::static_frames_per_second()); ++i) { if (!boost::filesystem::exists (_opt->frame_out_path (i, false))) { string const link = _opt->frame_out_path (i, false); #ifdef DVDOMATIC_POSIX |