Use a vector rather than a list when returning from content_factory().

[dcpomatic.git] / src / wx / content_view.cc

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index f4c9aca9d62009a186b3ae3747de012438084c89..95b481e0b75d5a74a56b1d5f4a0decadd44c7898 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -95,9 +95,12 @@ ContentView::update ()
 
                        shared_ptr<Content> content;
                        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();
+                               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];
+                               }
                        }
 
                        if (content) {