X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=46dead8506200edf4cbf44c421de2f7b2ce8a4b5;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=18251b4ecc5934c84972f4bd8fad09e093deaa60;hpb=3855bfd7991b1d7411934fc564dd5714eca6bc1b;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 18251b4ec..46dead850 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -59,8 +59,11 @@
 #include "lib/video_content.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
+#include <dcp/search.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/display.h>
 #include <wx/preferences.h>
@@ -68,6 +71,7 @@
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
@@ -437,9 +441,8 @@ public:
 			/* Offer a CPL menu */
 			auto first = dynamic_pointer_cast<DCPContent>(_film->content().front());
 			if (first) {
-				DCPExaminer ex (first, true);
 				int id = ID_view_cpl;
-				for (auto i: ex.cpls()) {
+				for (auto i: dcp::find_and_resolve_cpls(first->directories(), true)) {
 					auto j = _cpl_menu->AppendRadioItem(
 						id,
 						wxString::Format("%s (%s)", std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data())
@@ -694,11 +697,10 @@ private:
 	{
 		auto dcp = std::dynamic_pointer_cast<DCPContent>(_film->content().front());
 		DCPOMATIC_ASSERT (dcp);
-		DCPExaminer ex (dcp, true);
+		auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
 		int id = ev.GetId() - ID_view_cpl;
 		DCPOMATIC_ASSERT (id >= 0);
-		DCPOMATIC_ASSERT (id < int(ex.cpls().size()));
-		auto cpls = ex.cpls();
+		DCPOMATIC_ASSERT (id < int(cpls.size()));
 		auto i = cpls.begin();
 		while (id > 0) {
 			++i;