Move reel_split_points from VideoContent to Content.

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d104004f23c451ad00ed34c07c298d6e58a64c3e..514ecae2eaa7a12fd6e3f542e89c05d046bdf476 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -461,6 +461,8 @@ VideoContent::scale_and_crop_to_fit_width ()
        set_scale (VideoContentScale (film()->container ()));
 
        int const crop = max (0, int (video_size().height - double (film()->frame_size().height) * video_size().width / film()->frame_size().width));
+       set_left_crop (0);
+       set_right_crop (0);
        set_top_crop (crop / 2);
        set_bottom_crop (crop / 2);
 }
@@ -473,6 +475,8 @@ VideoContent::scale_and_crop_to_fit_height ()
        int const crop = max (0, int (video_size().width - double (film()->frame_size().width) * video_size().height / film()->frame_size().height));
        set_left_crop (crop / 2);
        set_right_crop (crop / 2);
+       set_top_crop (0);
+       set_bottom_crop (0);
 }
 
 void
@@ -582,15 +586,6 @@ VideoContent::add_properties (list<pair<string, string> >& p) const
        p.push_back (make_pair (_("Video frame rate"), raw_convert<string> (video_frame_rate()) + " " + _("frames per second")));
 }
 
-list<DCPTime>
-VideoContent::reel_split_points () const
-{
-       list<DCPTime> t;
-       /* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */
-       t.push_back (position().round_up (film()->video_frame_rate()));
-       return t;
-}
-
 double
 VideoContent::video_frame_rate () const
 {