diff options
| author | Dan Eble <nine.fierce.ballads@gmail.com> | 2016-06-04 15:25:13 -0400 |
|---|---|---|
| committer | Dan Eble <nine.fierce.ballads@gmail.com> | 2016-06-13 17:57:38 -0400 |
| commit | 0743ea2984c2b705a5e0748721f9ac2e30c575f5 (patch) | |
| tree | d635d1d319a8b6e9cb43099067808bb65c31e735 | |
| parent | fa512e34722a81101213ac1566175aba4da805dd (diff) | |
Issue 3945: fix (De)crescendo with unspecified starting volume in MIDI
| -rw-r--r-- | input/regression/midi/dynamic-initial.ly | 15 | ||||
| -rw-r--r-- | input/regression/typography-demo.ly | 1 | ||||
| -rw-r--r-- | lily/dynamic-performer.cc | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/input/regression/midi/dynamic-initial.ly b/input/regression/midi/dynamic-initial.ly new file mode 100644 index 0000000000..fca7c8ab81 --- /dev/null +++ b/input/regression/midi/dynamic-initial.ly @@ -0,0 +1,15 @@ +\version "2.19.44" + +\header { + texidoc="The MIDI performer uses a default initial dynamic" +} + +\score { + { c\< c\f } + \midi {} +} + +\score { + { c c\< c\f } + \midi {} +} diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly index c915c7fe52..836088123b 100644 --- a/input/regression/typography-demo.ly +++ b/input/regression/typography-demo.ly @@ -9,7 +9,6 @@ heavily mutilated Edition Peters Morgenlied by Schubert" } \version "2.19.21" -#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI.")) ignoreMelisma = \set ignoreMelismata = ##t ignoreMelismaOff = \unset ignoreMelismata diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 46a8a446d3..b24b7a6305 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -120,16 +120,6 @@ Dynamic_performer::process_music () announce_element (Audio_element_info (span_dynamic_, span_events_[START])); span_dynamic_->grow_dir_ = grow_dir_[START]; - - if (!last_volume_initialized_ && !script_event_) - { - // No explicit dynamic script events have occurred yet, but there is - // nevertheless a dynamic spanner. Initialize last_volume_ to a - // value within the available range. - span_events_[START]->origin ()->warning (_ ("(De)crescendo with unspecified starting volume in MIDI.")); - last_volume_ = equalize_volume (0.5); - last_volume_initialized_ = true; - } } if (script_event_ |