diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/wx/timeline_content_view.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/wx/timeline_content_view.cc')
| -rw-r--r-- | src/wx/timeline_content_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index 12691f661..69f1723ce 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -50,7 +50,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 +104,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); |