Add some tests; fix failure to make DCP when there is a bit of audio right at the...

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 8ccb921d04b06b932e63885be9adc302a0044b3d..92219b4c7cf9be404289d09f1be614f10f75144c 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -434,7 +434,7 @@ VideoContent::processing_description () const
        if (scaled != container_size) {
                d += String::compose (
                        _("\nPadded with black to fit container %1 (%2x%3)"),
-                       film->container()->nickname (),
+                       film->container()->container_nickname (),
                        container_size.width, container_size.height
                        );
 
@@ -538,3 +538,9 @@ VideoContent::use_template (shared_ptr<const VideoContent> c)
        _fade_in = c->_fade_in;
        _fade_out = c->_fade_out;
 }
+
+void
+VideoContent::modify_position (DCPTime& pos) const
+{
+       pos = pos.ceil (_parent->film()->video_frame_rate());
+}