Doc: NR - changing-defaults.itely - various improvements

[lilypond.git] / lily / audio-item.cc

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 0639508b6fd31a262917db864d3995c21b5fc84d..97a15d552aafaedc86053945c291d1d796d2eb7d 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -22,8 +22,6 @@
 #include "midi-item.hh"
 #include "audio-column.hh"
 
-using std::string;
-
 Audio_instrument::Audio_instrument (string instrument_string)
 {
   str_ = instrument_string;
@@ -169,7 +167,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_ = std::max (std::min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
+      dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
     }
 
   Real delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;