X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=f7b4704ace52caa583c2d09fb85926ba4a050aa7;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hp=f5218653dafb05e106e11546da72c14ad79ac825;hpb=951d70db4f81b5ddd4093f11853637c8ecbe63c5;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index f5218653d..f7b4704ac 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -110,10 +110,13 @@ extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::
 extern size_t utf8_strlen (std::string s);
 extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d);
 extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr<TextDecoder> decoder);
+extern bool show_jobs_on_console (bool progress);
+extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, boost::function<void (float)>);
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 extern boost::shared_ptr<dcp::CertificateChain> read_swaroop_chain (boost::filesystem::path path);
 extern void write_swaroop_chain (boost::shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path output);
 #endif
+extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container);
 
 template <class T>
 std::list<T>
@@ -126,4 +129,18 @@ vector_to_list (std::vector<T> v)
 	return l;
 }
 
+template <class T>
+std::vector<T>
+list_to_vector (std::list<T> v)
+{
+	std::vector<T> l;
+	BOOST_FOREACH (T& i, v) {
+		l.push_back (i);
+	}
+	return l;
+}
+
+extern double db_to_linear (double db);
+extern double linear_to_db (double linear);
+
 #endif