Change Film::examine_and_add_content to take a vector of content.

2 files changed, 5 insertions, 6 deletions

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 75326158d..32c5edb01 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -288,7 +288,7 @@ ContentMenu::join ()
 	try {
 		auto joined = make_shared<FFmpegContent>(fc);
 		film->remove_content (_content);
-		film->examine_and_add_content (joined);
+		film->examine_and_add_content({joined});
 	} catch (JoinError& e) {
 		error_dialog (_parent, std_to_wx (e.what ()));
 	}
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 06a257dbb..5803c3257 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -665,8 +665,9 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 			ic->set_video_frame_rate(_film, dialog.frame_rate());
 		}
 
-		_film->examine_and_add_content(i);
 	}
+
+	_film->examine_and_add_content(content);
 }
 
 
@@ -684,7 +685,7 @@ void
 ContentPanel::add_dcp(boost::filesystem::path dcp)
 {
 	try {
-		_film->examine_and_add_content(make_shared<DCPContent>(dcp));
+		_film->examine_and_add_content({make_shared<DCPContent>(dcp)});
 	} catch (ProjectFolderError &) {
 		error_dialog(
 			_parent,
@@ -963,9 +964,7 @@ ContentPanel::add_files(vector<boost::filesystem::path> paths)
 
 	try {
 		for (auto i: paths) {
-			for (auto j: content_factory(i)) {
-				_film->examine_and_add_content(j);
-			}
+			_film->examine_and_add_content(content_factory(i));
 		}
 	} catch (exception& e) {
 		error_dialog(_parent, std_to_wx(e.what()));