[Sv1-commits] SF.net SVN: sv1: [512] sonic-visualiser/trunk/base/AudioLevel.cpp
Brought to you by:
cannam
From: <ca...@us...> - 2007-02-16 15:04:24
|
Revision: 512 http://svn.sourceforge.net/sv1/?rev=512&view=rev Author: cannam Date: 2007-02-16 07:04:23 -0800 (Fri, 16 Feb 2007) Log Message: ----------- ... Modified Paths: -------------- sonic-visualiser/trunk/base/AudioLevel.cpp Modified: sonic-visualiser/trunk/base/AudioLevel.cpp =================================================================== --- sonic-visualiser/trunk/base/AudioLevel.cpp 2007-02-16 13:00:17 UTC (rev 511) +++ sonic-visualiser/trunk/base/AudioLevel.cpp 2007-02-16 15:04:23 UTC (rev 512) @@ -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]; +*/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |