Cleanup: move some methods from util to memory_util.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index bd9eaf96e1664f5286dedd6d5683a48616187e46..e335434d8dc4e90030a619fbc006aee3ec1b689d 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 */
@@ -106,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 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);
 extern std::string video_asset_filename (std::shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
@@ -152,15 +147,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