Position is not affected when Content video frame rate is set.

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 3814956d581951c3057a1112b6d9bfef5d0824a0..8fd36a1d8abf5c8a115ba22600ce20845b3ac19a 100644 (file)
--- 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;
        }
 
                _video_frame_rate = r;
        }
 

-       /* Make sure things are still on frame boundaries */
+       /* Make sure trim is still on a frame boundary */

        if (video) {
        if (video) {

-               set_position (position());

                set_trim_start (trim_start());
        }
 }
                set_trim_start (trim_start());
        }
 }

diff --git a/test/content_test.cc b/test/content_test.cc
index 330bbdc9462a3094d45253816859ab0698651ed6..398c88be26f7aa7b0a39729e80aac313cbd013d5 100644 (file)
--- 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));
        /* 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));

 }
 }