X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Finternet.h;h=041bb1bb13f4e48d1bc97b11ee7fabc3c2620cc6;hb=809bcfd85fad2ef7d4131c054be4cccd5bcc9d05;hp=5f9a25e3b2ab166adf7c81e8f0e330cb25bc7fda;hpb=35a7379dda587add9d94dc4f710414a23976d6e7;p=dcpomatic.git

diff --git a/src/lib/internet.h b/src/lib/internet.h
index 5f9a25e3b..041bb1bb1 100644
--- a/src/lib/internet.h
+++ b/src/lib/internet.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,29 @@
 
 */
 
-#include <boost/optional.hpp>
-#include <boost/function.hpp>
+
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
+
 
 class ScopedTemporary;
 
+
 boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp);
-boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load);
-boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load);
+
+boost::optional<std::string> get_from_url (
+	std::string url,
+	bool pasv,
+	bool skip_pasv_ip,
+	std::function<boost::optional<std::string> (boost::filesystem::path, std::string)> load
+	);
+
+boost::optional<std::string> get_from_zip_url (
+	std::string url,
+	std::string file,
+	bool pasv,
+	bool skip_pasv_ip,
+	std::function<boost::optional<std::string> (boost::filesystem::path, std::string)> load
+	);
+
 std::list<std::string> ls_url (std::string url);