X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=fd11fffbda2b5f2fbc41169aa1da3f5c14094e11;hb=cf2ed48d21ddbc32bda262064480e88e69dc031a;hp=cbf4b491b8f31acdf6ebc243eb7696d132128222;hpb=9bda3fda70912d73266a2dbac5470ca23d2ff6fd;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index cbf4b491b..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 */ @@ -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 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 split_get_request (std::string url); @@ -153,15 +148,4 @@ list_to_vector (std::list v) return l; } -extern double db_to_linear (double db); -extern double linear_to_db (double linear); - - -template -T clamp (T val, T minimum, T maximum) -{ - return std::max(std::min(val, maximum), minimum); -} - - #endif