Change ExamineContentJob to take a vector of content.

2 files changed, 17 insertions, 14 deletions

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 559b57553..75326158d 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -395,7 +395,7 @@ ContentMenu::re_examine ()
 	}
 
 	for (auto i: _content) {
-		JobManager::instance()->add(make_shared<ExamineContentJob>(film, i, false));
+		JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{i}, false));
 	}
 }
 
@@ -449,7 +449,7 @@ ContentMenu::kdm ()
 
 	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	JobManager::instance()->add(make_shared<ExamineContentJob>(film, dcp, false));
+	JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false));
 }
 
 void
@@ -467,7 +467,7 @@ ContentMenu::ov ()
 		dcp->add_ov(dialog.path());
 		auto film = _film.lock();
 		DCPOMATIC_ASSERT (film);
-		JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp, false));
+		JobManager::instance()->add (make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false));
 	}
 }
 
@@ -532,7 +532,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
 
 	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	JobManager::instance()->add(make_shared<ExamineContentJob>(film, dcp, false));
+	JobManager::instance()->add(make_shared<ExamineContentJob>(film, vector<shared_ptr<Content>>{dcp}, false));
 }
 
 
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index fa6bd64dc..0bbc80535 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -48,6 +48,7 @@ using std::list;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
+using std::vector;
 using std::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
@@ -109,7 +110,7 @@ ContentView::update ()
 			}
 
 			if (content) {
-				auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), content, false);
+				auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), vector<shared_ptr<Content>>{content}, false);
 				jm->add (job);
 				jobs.push_back (job);
 			}
@@ -136,16 +137,18 @@ ContentView::update ()
 		if (i->finished_in_error()) {
 			error_dialog(this, std_to_wx(i->error_summary()) + char_to_wx(".\n"), std_to_wx(i->error_details()));
 		} else {
-			if (auto dcp = dynamic_pointer_cast<DCPContent>(i->content())) {
-				for (auto cpl: dcp::find_and_resolve_cpls(dcp->directories(), true)) {
-					auto copy = dynamic_pointer_cast<DCPContent>(dcp->clone());
-					copy->set_cpl(cpl->id());
-					add(copy);
-					_content.push_back(copy);
+			for (auto c: i->content()) {
+				if (auto dcp = dynamic_pointer_cast<DCPContent>(c)) {
+					for (auto cpl: dcp::find_and_resolve_cpls(dcp->directories(), true)) {
+						auto copy = dynamic_pointer_cast<DCPContent>(dcp->clone());
+						copy->set_cpl(cpl->id());
+						add(copy);
+						_content.push_back(copy);
+					}
+				} else {
+					add(c);
+					_content.push_back(c);
 				}
-			} else {
-				add(i->content());
-				_content.push_back(i->content());
 			}
 		}
 	}