Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 8d10141524466326886bd64b41982c620b8a8d3b..6837df0d744838c4eff0978318902ff3d6324e6c 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -60,9 +60,9 @@ peak_around (Real epsilon,  Real threshold, Real x)
   0 at 0,  1 at standard_x, and increasing thereafter. 
  */
 Real
-convex_amplifier (Real standard_x, Real x)
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  return (exp (x / standard_x) - 1.0) / (exp (1) - 1.0); 
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); 
 }
 
 string