diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-13 15:42:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | f36136e70efbc19255142319a1676f25fa55f780 (patch) | |
| tree | ec4b55b53c40be2315bc26ebd6a11d32d028fc98 /src | |
| parent | 29fe2d3a4c347e15b987f9e61e56d22a21d4678f (diff) | |
Various text fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 6 | ||||
| -rw-r--r-- | src/lib/playlist.cc | 2 | ||||
| -rw-r--r-- | src/lib/playlist.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 87a317e57..e2e90cd27 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -887,7 +887,7 @@ Film::signal_changed (Property p) switch (p) { case Film::CONTENT: - set_video_frame_rate (_playlist->best_dcp_frame_rate ()); + set_video_frame_rate (_playlist->best_video_frame_rate ()); break; case Film::VIDEO_FRAME_RATE: case Film::SEQUENCE: @@ -1082,7 +1082,7 @@ Film::length () const int Film::best_video_frame_rate () const { - return _playlist->best_dcp_frame_rate (); + return _playlist->best_video_frame_rate (); } FrameRateChange @@ -1097,7 +1097,7 @@ Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent) _dirty = true; if (p == ContentProperty::VIDEO_FRAME_RATE) { - set_video_frame_rate (_playlist->best_dcp_frame_rate ()); + set_video_frame_rate (_playlist->best_video_frame_rate ()); } else if (p == AudioContentProperty::STREAMS) { signal_changed (NAME); } diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index b473bee8a..bd6abc31d 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -240,7 +240,7 @@ public: }; int -Playlist::best_dcp_frame_rate () const +Playlist::best_video_frame_rate () const { list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates (); diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 0ad70b524..c3890ce8c 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -61,7 +61,7 @@ public: boost::optional<DCPTime> start () const; int64_t required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const; - int best_dcp_frame_rate () const; + int best_video_frame_rate () const; DCPTime video_end () const; DCPTime subtitle_end () const; FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const; |