Make player more tolerant of some DCP errors.

[dcpomatic.git] / src / wx / timeline_content_view.cc

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 12691f661d34d163eff989173d62bb1254f63ab0..6902a11d62633785e1f0d3dd910793e378a4a9ca 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -27,6 +27,7 @@
 
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
        : TimelineView (tl)
@@ -50,7 +51,7 @@ TimelineContentView::bbox () const
        return dcpomatic::Rect<int> (
                time_x (content->position ()),
                y_pos (_track.get()),
-               content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0),
+               content->length_after_trim(film).seconds() * _timeline.pixels_per_second().get_value_or(0),
                _timeline.pixels_per_track()
                );
 }
@@ -104,7 +105,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
        }
 
        DCPTime const position = cont->position ();
-       DCPTime const len = cont->length_after_trim ();
+       DCPTime const len = cont->length_after_trim (film);
 
        wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
 
@@ -127,7 +128,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);