Cleanup: move some methods from util to maths_util.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 0f3351dbf864e68c134cf618699af498a4beb227..790feea05242a08a7b4df65a7770fe92bfbe7b62 100644 (file)
--- 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 */
@@ -130,15 +126,6 @@ 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);
-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