Cleanup: add convert_to_lower() and matches_search().

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

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index c26186c552f550deda76858f47b92de262fb329e..73cc9e68bcee4dde0d88698a4192ff97d4cdfc92 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -28,6 +28,7 @@
 #include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
+#include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/warnings.h>
 #include <boost/filesystem.hpp>
@@ -94,10 +95,13 @@ ContentView::update ()
                        progress.Pulse ();
 
                        shared_ptr<Content> content;
-                       if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
-                               content.reset (new DCPContent(i));
+                       if (is_directory(i) && contains_assetmap(i)) {
+                               content = make_shared<DCPContent>(i);
                        } else if (i.path().extension() == ".mp4") {
-                               content = content_factory(i).front();
+                               auto all_content = content_factory(i);
+                               if (!all_content.empty()) {
+                                       content = all_content[0];
+                               }
                        }
 
                        if (content) {
@@ -152,7 +156,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);
        }