Use dcp::file_to_string().

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 564e376adc12b82dcf427854b97cd1270520c650..013eabe120678c415f28e176a115ed729a12eae3 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -118,17 +118,19 @@ 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, std::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)>);
+extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::function<void (float)>);
 extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container);
 extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm);
 extern boost::filesystem::path default_font_file ();
+extern std::string to_upper (std::string s);
+extern void start_of_thread (std::string name);
 
 template <class T>
 std::list<T>
 vector_to_list (std::vector<T> v)
 {
        std::list<T> l;
-       BOOST_FOREACH (T& i, v) {
+       for (auto& i: v) {
                l.push_back (i);
        }
        return l;
@@ -139,7 +141,7 @@ std::vector<T>
 list_to_vector (std::list<T> v)
 {
        std::vector<T> l;
-       BOOST_FOREACH (T& i, v) {
+       for (auto& i: v) {
                l.push_back (i);
        }
        return l;
@@ -148,4 +150,12 @@ list_to_vector (std::list<T> v)
 extern double db_to_linear (double db);
 extern double linear_to_db (double linear);
 
+
+template <class T>
+T clamp (T val, T minimum, T maximum)
+{
+       return std::max(std::min(val, maximum), minimum);
+}
+
+
 #endif