shared_ptr<Content> content;
if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
- content.reset (new DCPContent(i));
+ content = make_shared<DCPContent>(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];
}
}
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);
}