diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-22 23:47:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-22 23:47:22 +0000 |
| commit | 7fc6ace0efdecbe6714ce9fb54d71d3cea39f406 (patch) | |
| tree | e140c5391b6b11297a6342d94b9a10f6b6646222 /src | |
| parent | 6349c88c4fb9d4ac76ef14b277d455e3a2b006a6 (diff) | |
Fix build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/content_view.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index 51473cb86..fdc7afcab 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -89,9 +89,9 @@ ContentView::update () try { shared_ptr<Content> content; if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) { - content.reset (new DCPContent(film, *i)); + content.reset (new DCPContent(*i)); } else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") { - content = content_factory(film, *i).front(); + content = content_factory(*i).front(); } if (content) { @@ -133,10 +133,13 @@ ContentView::add (shared_ptr<Content> content) { int const N = GetItemCount(); + shared_ptr<Film> film = _film.lock (); + DCPOMATIC_ASSERT (film); + wxListItem it; it.SetId(N); it.SetColumn(0); - DCPTime length = content->length_after_trim (); + DCPTime length = content->length_after_trim (film); int h, m, s, f; length.split (24, h, m, s, f); it.SetText(wxString::Format("%02d:%02d:%02d", h, m, s)); |