Supporters update.

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1d1d010a95662193bc52ab84e5dacb2b8746fb10..6c3f23a5702ebd2735936c914b204bc8c366bfc4 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -105,12 +105,6 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
        _size.width = node->number_child<int> ("VideoWidth");
        _size.height = node->number_child<int> ("VideoHeight");
 
-       /* Backwards compatibility */
-       auto r = node->optional_number_child<double>("VideoFrameRate");
-       if (r) {
-               _parent->set_video_frame_rate (r.get ());
-       }
-
        _use = node->optional_bool_child("Use").get_value_or(true);
        _length = node->number_child<Frame> ("VideoLength");
 
@@ -311,7 +305,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 }
 
 void
-VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
+VideoContent::take_from_examiner(shared_ptr<const Film> film, shared_ptr<VideoExaminer> d)
 {
        /* These examiner calls could call other content methods which take a lock on the mutex */
        auto const vs = d->video_size ();
@@ -338,7 +332,7 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
        LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
 
        if (d->video_frame_rate()) {
-               _parent->set_video_frame_rate (d->video_frame_rate().get());
+               _parent->set_video_frame_rate(film, d->video_frame_rate().get());
        }
 }
 
@@ -629,6 +623,7 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
        set_fade_in (c->_fade_in);
        set_fade_out (c->_fade_out);
        set_burnt_subtitle_language (c->_burnt_subtitle_language);
+       set_range(c->_range);
 }
 
 
@@ -656,7 +651,10 @@ VideoContent::scaled_size (dcp::Size film_container)
        }
 
        if (_custom_size) {
-               return *_custom_size;
+               if (_custom_size->width <= film_container.width && _custom_size->height <= film_container.height) {
+                       return *_custom_size;
+               }
+               return fit_ratio_within(_custom_size->ratio(), film_container);
        }
 
        auto size = size_after_crop ();