diff options
Diffstat (limited to 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 9a292ce27..e2ea7c076 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -554,7 +554,7 @@ Playlist::active_frame_rate_change(DCPTime t, int dcp_video_frame_rate) const { auto cont = content(); for (ContentList::const_reverse_iterator i = cont.rbegin(); i != cont.rend(); ++i) { - if (!(*i)->video) { + if (!(*i)->video || !(*i)->video->use()) { continue; } @@ -730,12 +730,12 @@ Playlist::speed_up_range(int dcp_video_frame_rate) const } if (i->video_frame_rate()) { FrameRateChange const frc(i->video_frame_rate().get(), dcp_video_frame_rate); - range.first = min(range.first, frc.speed_up); - range.second = max(range.second, frc.speed_up); + range.first = min(range.first, frc.speed_up()); + range.second = max(range.second, frc.speed_up()); } else { FrameRateChange const frc(dcp_video_frame_rate, dcp_video_frame_rate); - range.first = min(range.first, frc.speed_up); - range.second = max(range.second, frc.speed_up); + range.first = min(range.first, frc.speed_up()); + range.second = max(range.second, frc.speed_up()); } } |