X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=0639508b6fd31a262917db864d3995c21b5fc84d;hb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;hp=7934c34c4a1e86e3eea155c94298c36870c1aa68;hpb=8848da24e00c75d7de626b2ecc409fb45e87ce4a;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 7934c34c4a..0639508b6f 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 #include "midi-item.hh"
 #include "audio-column.hh"
 
+using std::string;
+
 Audio_instrument::Audio_instrument (string instrument_string)
 {
   str_ = instrument_string;
@@ -167,7 +169,7 @@ Audio_span_dynamic::render ()
       // The dynamic spanner does not end with an explicit dynamic script
       // event.  Adjust the end volume by at most 1/4 of the available
       // volume range in this case.
-      dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
+      dynamics_.back ()->volume_ = std::max (std::min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
     }
 
   Real delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
@@ -217,6 +219,7 @@ Audio_control_function_value_change::context_properties_[] = {
   // property name, enum constant, lower bound for range, upper bound for range
   { "midiBalance",     BALANCE,      -1.0, 1.0 },
   { "midiPanPosition", PAN_POSITION, -1.0, 1.0 },
+  { "midiExpression",  EXPRESSION,    0.0, 1.0 },
   { "midiReverbLevel", REVERB_LEVEL,  0.0, 1.0 },
   { "midiChorusLevel", CHORUS_LEVEL,  0.0, 1.0 },
   // extra element to signify the end of the mapping, must be kept last