X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=468b3bf97c0e4b324984d9c295c1939858f75a2d;hb=82b08e910e07bb571b11368124d49dc3d73e33ca;hp=57a5535c9bd8eb1b3d3208d77fb66ec4b19204f7;hpb=70890b3f8e5e083be45016091a0e01c113d357dd;p=dcpomatic.git diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index 57a5535c9..468b3bf97 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -95,11 +95,11 @@ ContentView::update () shared_ptr content; if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) { - content.reset (new DCPContent(i)); + content = make_shared(i); } else if (i.path().extension() == ".mp4") { auto all_content = content_factory(i); if (!all_content.empty()) { - content = all_content.front(); + content = all_content[0]; } } @@ -155,7 +155,7 @@ ContentView::add (shared_ptr content) if (dcp && dcp->content_kind()) { it.SetId(N); it.SetColumn(1); - it.SetText(std_to_wx(dcp::content_kind_to_string(*dcp->content_kind()))); + it.SetText(std_to_wx(dcp->content_kind()->name())); SetItem(it); }