diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-04 01:28:54 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-04 01:28:54 +0000 |
| commit | 11ac33e140f3aa9d6e992880a1e1b3a4ca649355 (patch) | |
| tree | 6bf84806228017259803c3cd972166dd410c3b33 /src/lib | |
| parent | 3327fcba6db6c0b2e70ccca81340f5d5781cae0d (diff) | |
Rename Time::round_up to Time::ceil.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/content.cc | 2 | ||||
| -rw-r--r-- | src/lib/dcpomatic_time.h | 6 | ||||
| -rw-r--r-- | src/lib/ffmpeg.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index b5bae69b6..942e9e533 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -327,7 +327,7 @@ Content::reel_split_points () const { list<DCPTime> t; /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */ - t.push_back (position().round_up (film()->video_frame_rate())); + t.push_back (position().ceil (film()->video_frame_rate())); return t; } diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h index 893bce257..6834ee099 100644 --- a/src/lib/dcpomatic_time.h +++ b/src/lib/dcpomatic_time.h @@ -118,7 +118,7 @@ public: * at some sampling rate. * @param r Sampling rate. */ - Time<S, O> round_up (float r) const { + Time<S, O> ceil (float r) const { Type const n = llrintf (HZ / r); Type const a = _t + n - 1; return Time<S, O> (a - (a % n)); @@ -152,7 +152,7 @@ public: the calculation will round down before we get the chance to ceil(). */ - return ceil (_t * double(r) / HZ); + return ::ceil (_t * double(r) / HZ); } /** @param r Frames per second */ @@ -211,7 +211,7 @@ public: } private: - friend struct dcptime_round_up_test; + friend struct dcptime_ceil_test; Type _t; static const int HZ = 96000; diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index af6c8e167..ce87cc14f 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -381,7 +381,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option /* Now adjust so that the video pts starts on a frame */ if (first_video) { ContentTime const fvc = first_video.get() + po; - po += fvc.round_up (video_frame_rate) - fvc; + po += fvc.ceil (video_frame_rate) - fvc; } return po; diff --git a/src/lib/film.cc b/src/lib/film.cc index d331516dd..68266b4ec 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1416,7 +1416,7 @@ list<DCPTimePeriod> Film::reels () const { list<DCPTimePeriod> p; - DCPTime const len = length().round_up (video_frame_rate ()); + DCPTime const len = length().ceil (video_frame_rate ()); switch (reel_type ()) { case REELTYPE_SINGLE: |