diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-17 09:03:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-17 09:03:57 +0100 |
| commit | 10b9dfec41caf38bd111e7a8a03c73ebe04489b5 (patch) | |
| tree | 1f5cd2caea082ed63b2a19e15fe2c5b654f873bd | |
| parent | bb990ccc49ee724a8af2ad80bde066374af4b68a (diff) | |
Position is not affected when Content video frame rate is set.
| -rw-r--r-- | src/lib/content.cc | 3 | ||||
| -rw-r--r-- | test/content_test.cc | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 3814956d5..8fd36a1d8 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -372,9 +372,8 @@ Content::set_video_frame_rate (double r) _video_frame_rate = r; } - /* Make sure things are still on frame boundaries */ + /* Make sure trim is still on a frame boundary */ if (video) { - set_position (position()); set_trim_start (trim_start()); } } diff --git a/test/content_test.cc b/test/content_test.cc index 330bbdc94..398c88be2 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -120,9 +120,4 @@ BOOST_AUTO_TEST_CASE (content_test3) /* Check that trim is fixed when the content's video frame rate is `forced' */ BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (15.0 / 25.0)); - - /* Likewise position */ - - std::cout << to_string(content->position()) << " " << to_string(DCPTime::from_seconds(15.0 / 25.0)) << "\n"; - BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0)); } |