Fix missed overload change.

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 11bf63f11eb1c8e0761bd8d9491ab2076e61ff2c..1e73418b64bf8be7fdf6a2d63d2b6857c4301774 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -365,7 +365,7 @@ Content::user_properties () const
 
 /** @return DCP times of points within this content where a reel split could occur */
 list<DCPTime>
-Content::reel_split_points () const
+Content::reel_split_points (shared_ptr<const Film>) const
 {
        list<DCPTime> t;
        /* This is only called for video content and such content has its position forced

diff --git a/src/lib/content.h b/src/lib/content.h
index 552017c64179920d4ad5240a486da088167e5988..bb66bc1416233c322705fd6f07e4969182dd752c 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -96,7 +96,7 @@ public:
        /** @return points at which to split this content when
         *  REELTYPE_BY_VIDEO_CONTENT is in use.
         */
-       virtual std::list<DCPTime> reel_split_points () const;
+       virtual std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film>) const;
 
        boost::shared_ptr<Content> clone () const;
 

diff --git a/src/lib/film.cc b/src/lib/film.cc
index d27b15a65e9af124ee7db2d23f8e864197abe7b2..61d9eee9117853ef458074bc5bde95776d61e544 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1493,7 +1493,7 @@ Film::reels () const
                shared_ptr<Content> last_video;
                BOOST_FOREACH (shared_ptr<Content> c, content ()) {
                        if (c->video) {
-                               BOOST_FOREACH (DCPTime t, c->reel_split_points()) {
+                               BOOST_FOREACH (DCPTime t, c->reel_split_points(shared_from_this())) {
                                        if (last_split) {
                                                p.push_back (DCPTimePeriod (last_split.get(), t));
                                        }

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 206c13cf69e64fa15a00316dfff917de9d9304a0..f15c06d3859bf0cf6c3d047d2fa0553479684e0a 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -531,7 +531,7 @@ Timeline::left_down_select (wxMouseEvent& ev)
                        _start_snaps.push_back (cv->content()->end(film));
                        _end_snaps.push_back (cv->content()->end(film));
 
-                       BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) {
+                       BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points(film)) {
                                _start_snaps.push_back (i);
                        }
                }

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 69f1723cee28b6ea055ab647a1833882fa7a0e67..a55526c88604378691ce162ebf485d20dc0b85a5 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -127,7 +127,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 
        /* Reel split points */
        gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 1, wxPENSTYLE_DOT));
-       BOOST_FOREACH (DCPTime i, cont->reel_split_points ()) {
+       BOOST_FOREACH (DCPTime i, cont->reel_split_points(film)) {
                path = gc->CreatePath ();
                path.MoveToPoint (time_x (i), y_pos (_track.get()) + 4);
                path.AddLineToPoint (time_x (i), y_pos (_track.get() + 1) - 4);