diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-24 00:34:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-24 00:34:03 +0000 |
| commit | 08aed48d141f403a93640cf62d8be70161bd1d30 (patch) | |
| tree | cb8e9bb77e26152ca13d2cb20a62ab9c8221cfc1 /src | |
| parent | 7dad3914a40ba78b8a1964a0b27f88da0ff802d7 (diff) | |
Fix missed overload change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/content.cc | 2 | ||||
| -rw-r--r-- | src/lib/content.h | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | src/wx/timeline.cc | 2 | ||||
| -rw-r--r-- | src/wx/timeline_content_view.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 11bf63f11..1e73418b6 100644 --- 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 552017c64..bb66bc141 100644 --- 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 d27b15a65..61d9eee91 100644 --- 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 206c13cf6..f15c06d38 100644 --- 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 69f1723ce..a55526c88 100644 --- 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); |