X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_player.cc;h=b39e59d6ba302dc1caa80cdf88e3bc4361dcd2fe;hb=12b1a3f10ee0e14691e68784bfccc7359d44b0a4;hp=26110b373761e5a02f867d98a658dae69b7c788f;hpb=f37b8122a04c6a7f8a86c77de44ac995b9555d1a;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 26110b373..b39e59d6b 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -389,49 +389,6 @@ public:
 		}
 	}
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	optional<dcp::EncryptedKDM> get_kdm_from_url (shared_ptr<DCPContent> dcp)
-	{
-		ScopedTemporary temp;
-		string url = Config::instance()->kdm_server_url();
-		boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl());
-		optional<dcp::EncryptedKDM> kdm;
-		if (dcp->cpl() && !get_from_url(url, false, temp)) {
-			try {
-				kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
-				if (kdm->cpl_id() != dcp->cpl()) {
-					kdm = boost::none;
-				}
-			} catch (std::exception& e) {
-				/* Hey well */
-			}
-		}
-		return kdm;
-	}
-#endif
-
-	optional<dcp::EncryptedKDM> get_kdm_from_directory (shared_ptr<DCPContent> dcp)
-	{
-		using namespace boost::filesystem;
-		optional<path> kdm_dir = Config::instance()->player_kdm_directory();
-		if (!kdm_dir) {
-			return optional<dcp::EncryptedKDM>();
-		}
-		for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
-			try {
-				if (file_size(i->path()) < MAX_KDM_SIZE) {
-					dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
-					if (kdm.cpl_id() == dcp->cpl()) {
-						return kdm;
-					}
-				}
-			} catch (std::exception& e) {
-				/* Hey well */
-			}
-		}
-		return optional<dcp::EncryptedKDM>();
-	}
-
 	void reset_film_weak (weak_ptr<Film> weak_film)
 	{
 		shared_ptr<Film> film = weak_film.lock ();
@@ -464,20 +421,6 @@ public:
 
 		BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
 			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
-			if (dcp && dcp->needs_kdm()) {
-				optional<dcp::EncryptedKDM> kdm;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-				kdm = get_kdm_from_url (dcp);
-#endif
-				if (!kdm) {
-					kdm = get_kdm_from_directory (dcp);
-				}
-
-				if (kdm) {
-					dcp->add_kdm (*kdm);
-					dcp->examine (_film, shared_ptr<Job>());
-				}
-			}
 
 			BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
 				j->set_use (true);