X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=73cc9e68bcee4dde0d88698a4192ff97d4cdfc92;hb=ed0b5670e65647a9f0555ed66f81125678d193a7;hp=44e575d9393bcc06a349d88901c1cb5b20021a10;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 44e575d93..73cc9e68b 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,29 +18,37 @@
 
 */
 
+
 #include "content_view.h"
 #include "wx_util.h"
-#include "lib/dcpomatic_assert.h"
 #include "lib/config.h"
-#include "lib/dcp_content.h"
 #include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
-#include "lib/cross.h"
+#include "lib/util.h"
 #include <dcp/exceptions.h>
+#include <dcp/warnings.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::string;
 using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using std::weak_ptr;
 using boost::optional;
-using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
+
 ContentView::ContentView (wxWindow* parent)
 	: wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
 {
@@ -51,18 +59,20 @@ ContentView::ContentView (wxWindow* parent)
 	AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
 }
 
+
 shared_ptr<Content>
 ContentView::selected () const
 {
 	long int s = GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (s == -1) {
-		return shared_ptr<Content>();
+		return {};
 	}
 
 	DCPOMATIC_ASSERT (s < int(_content.size()));
 	return _content[s];
 }
 
+
 void
 ContentView::update ()
 {
@@ -70,29 +80,32 @@ ContentView::update ()
 
 	DeleteAllItems ();
 	_content.clear ();
-	optional<path> dir = Config::instance()->player_content_directory();
+	auto dir = Config::instance()->player_content_directory();
 	if (!dir || !boost::filesystem::is_directory(*dir)) {
 		dir = home_directory ();
 	}
 
 	wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory"));
-	JobManager* jm = JobManager::instance ();
+	auto jm = JobManager::instance ();
 
-	list<shared_ptr<ExamineContentJob> > jobs;
+	list<shared_ptr<ExamineContentJob>> jobs;
 
-	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
+	for (auto i: directory_iterator(*dir)) {
 		try {
 			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));
-			} 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];
+				}
 			}
 
 			if (content) {
-				shared_ptr<ExamineContentJob> job(new ExamineContentJob(shared_ptr<Film>(), content));
+				auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), content);
 				jm->add (job);
 				jobs.push_back (job);
 			}
@@ -125,6 +138,7 @@ ContentView::update ()
 	}
 }
 
+
 void
 ContentView::add (shared_ptr<Content> content)
 {
@@ -133,17 +147,16 @@ ContentView::add (shared_ptr<Content> content)
 	wxListItem it;
 	it.SetId(N);
 	it.SetColumn(0);
-	DCPTime length = content->approximate_length ();
-	int h, m, s, f;
-	length.split (24, h, m, s, f);
-	it.SetText(wxString::Format("%02d:%02d:%02d", h, m, s));
+	auto length = content->approximate_length ();
+	auto const hmsf = length.split (24);
+	it.SetText(wxString::Format("%02d:%02d:%02d", hmsf.h, hmsf.m, hmsf.s));
 	InsertItem(it);
 
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(content);
+	auto dcp = dynamic_pointer_cast<DCPContent>(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);
 	}
 
@@ -153,6 +166,7 @@ ContentView::add (shared_ptr<Content> content)
 	SetItem(it);
 }
 
+
 shared_ptr<Content>
 ContentView::get (string digest) const
 {
@@ -162,5 +176,5 @@ ContentView::get (string digest) const
 		}
 	}
 
-	return shared_ptr<Content>();
+	return {};
 }