X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flogcurve.h;h=2585da66c8d79814f11f7f99fd67f218bd70cab3;hb=a373e4cfc80cfc1dc712ecdf8013c18286ce2a6b;hp=dd58263313322a1d00f3225bf38120897bccf71a;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index dd58263313..2585da66c8 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Steve Harris & Paul Davis + Copyright (C) 2001 Steve Harris & Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,12 +20,12 @@ #ifndef __ardour_logcurve_h__ #define __ardour_logcurve_h__ -#include -#include +#include "pbd/fastlog.h" +#include namespace ARDOUR { -class LogCurve { +class LIBARDOUR_API LogCurve { public: LogCurve (float steepness = 0.2, uint32_t len = 0) { l = len; @@ -41,22 +41,22 @@ class LogCurve { bool operator!= (const LogCurve& other) const { return S != other.S || l != other.l; } - + float value (float frac) const { return (fast_log(frac + S) - a) * b; - } - + } + float value (uint32_t pos) const { return (fast_log(((float) pos/l) + S) - a) * b; - } + } float invert_value (float frac) const { return (a - fast_log(frac + S)) * b; - } - + } + float invert_value (uint32_t pos) const { return (a - fast_log(((float) pos/l) + S)) * b; - } + } void fill (float *vec, uint32_t veclen, bool invert) const { float dx = 1.0f/veclen; @@ -85,15 +85,15 @@ class LogCurve { float steepness() const { return S; } uint32_t length() const { return l; } - - void set_steepness (float steepness) { - S = steepness; - a = log(S); + + void set_steepness (float steepness) { + S = steepness; + a = log(S); b = 1.0f / log(1.0f + (1.0f / S)); } void set_length (uint32_t len) { l = len; } - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; protected: float a; @@ -102,25 +102,25 @@ class LogCurve { uint32_t l; }; -class LogCurveIn : public LogCurve +class LIBARDOUR_API LogCurveIn : public LogCurve { public: - LogCurveIn (float steepness = 0.2, uint32_t len = 0) + LogCurveIn (float steepness = 0.2, uint32_t len = 0) : LogCurve (steepness, len) {} float value (float frac) const { return (fast_log(frac + S) - a) * b; - } - + } + float value (uint32_t pos) const { return (fast_log(((float) pos/l) + S) - a) * b; - } + } }; -class LogCurveOut : public LogCurve +class LIBARDOUR_API LogCurveOut : public LogCurve { public: - LogCurveOut (float steepness = 0.2, uint32_t len = 0) + LogCurveOut (float steepness = 0.2, uint32_t len = 0) : LogCurve (steepness, len) {} };