Use plain git hash for VERSION when there is no exact tag.

[dcpomatic.git] / src / lib / internet.h

diff --git a/src/lib/internet.h b/src/lib/internet.h
index 8aa7264c61372d07c75f46a40cf5f59cf4ab3f55..041bb1bb13f4e48d1bc97b11ee7fabc3c2620cc6 100644 (file)
--- a/src/lib/internet.h
+++ b/src/lib/internet.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 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<boost::optional<std::string> (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<boost::optional<std::string> (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);