X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=468b3bf97c0e4b324984d9c295c1939858f75a2d;hb=978b1c022a0949296e1e6ac8c5c95481f89033a1;hp=f4c9aca9d62009a186b3ae3747de012438084c89;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index f4c9aca9d..468b3bf97 100644
--- 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) {
@@ -152,7 +155,7 @@ ContentView::add (shared_ptr<Content> 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);
 	}