- if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
- content.reset (new DCPContent(i));
- } else if (i.path().extension() == ".mp4" || i.path().extension() == ".ecinema") {
- content = content_factory(i).front();
+ if (is_directory(i) && contains_assetmap(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[0];
+ }