X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Finternet.h;h=5f9a25e3b2ab166adf7c81e8f0e330cb25bc7fda;hb=9262839360779de83b711f86151fcf56b86c3989;hp=b477bb4473d0978e7245648417e702a097e2ce39;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/internet.h b/src/lib/internet.h index b477bb447..5f9a25e3b 100644 --- a/src/lib/internet.h +++ b/src/lib/internet.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -22,5 +22,9 @@ #include #include -boost::optional get_from_zip_url (std::string url, std::string file, bool pasv, boost::function load); -std::list ftp_ls (std::string dir, bool pasv = true); +class ScopedTemporary; + +boost::optional get_from_url (std::string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp); +boost::optional get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function load); +boost::optional get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function load); +std::list ls_url (std::string url);