X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=fd11fffbda2b5f2fbc41169aa1da3f5c14094e11;hb=cf2ed48d21ddbc32bda262064480e88e69dc031a;hp=10c5678ffd37f72c4b0e37c0d450f18ad950efa3;hpb=969906f2dd6c5c144781861f53e2a0f6baefb9a3;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 10c5678ff..fd11fffbd 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -51,10 +51,6 @@ namespace dcp {
 	class SoundAsset;
 }
 
-#ifndef M_PI
-#define M_PI (3.14159265358979323846)
-#endif
-
 /** The maximum number of audio channels that we can have in a DCP */
 #define MAX_DCP_AUDIO_CHANNELS 16
 /** Message broadcast to find possible encoding servers */
@@ -78,6 +74,7 @@ namespace dcp {
 /** Maximum size of the XML part of a closed caption file, according to SMPTE Bv2.1 */
 #define MAX_CLOSED_CAPTION_XML_SIZE (256 * 1024)
 #define MAX_CLOSED_CAPTION_XML_SIZE_TEXT "256KB"
+#define CERTIFICATE_VALIDITY_PERIOD (10 * 365)
 
 extern std::string program_name;
 extern bool is_batch_converter;
@@ -105,7 +102,6 @@ extern boost::filesystem::path mo_path ();
 #endif
 extern std::string tidy_for_filename (std::string);
 extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
-extern int stride_round_up (int, int const *, int);
 extern void* wrapped_av_malloc (size_t);
 extern void set_backtrace_file (boost::filesystem::path);
 extern std::map<std::string, std::string> split_get_request (std::string url);
@@ -152,15 +148,4 @@ list_to_vector (std::list<T> v)
 	return l;
 }
 
-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