# HG changeset patch # User Chris Cannam # Date 1171638263 0 # Node ID fd331fac5f38e40c0e9628fb927225045fc3e40c # Parent 0d943a3fcc77e964ee90753759e204abb0ad61dc ... diff -r 0d943a3fcc77 -r fd331fac5f38 base/AudioLevel.cpp --- a/base/AudioLevel.cpp Fri Feb 16 13:00:17 2007 +0000 +++ b/base/AudioLevel.cpp Fri Feb 16 15:04:23 2007 +0000 @@ -52,7 +52,8 @@ float AudioLevel::multiplier_to_dB(float multiplier) { - if (multiplier == 0.0) return DB_FLOOR; + if (multiplier == 0.f) return DB_FLOOR; + else if (multiplier < 0.f) return multiplier_to_dB(-multiplier); float dB = 10 * log10f(multiplier); return dB; } @@ -231,6 +232,10 @@ AudioLevel::multiplier_to_preview(float m, int levels) { assert(levels > 0); + return multiplier_to_fader(m, levels, PreviewLevel); + + /* The original multiplier_to_preview which follows is not thread-safe. + if (m < 0.0) return -multiplier_to_preview(-m, levels); const LevelList &ll = getPreviewLevelCache(levels); @@ -259,15 +264,20 @@ } return result; + + */ } float AudioLevel::preview_to_multiplier(int level, int levels) { assert(levels > 0); + return fader_to_multiplier(level, levels, PreviewLevel); +/* if (level < 0) return -preview_to_multiplier(-level, levels); const LevelList &ll = getPreviewLevelCache(levels); return ll[level]; +*/ }