/*
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
#include "midi-item.hh"
#include "audio-column.hh"
+using std::string;
+
Audio_instrument::Audio_instrument (string instrument_string)
{
str_ = instrument_string;
// 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_;
// 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