X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-music-iterator.cc;h=31959d48d53e800492808057e49ea4308fe86848;hb=1b9fc29140bd1d9345f784595afd22158876dfb7;hp=fcc99f05babc9718492fd710f9534d28f28a6ac5;hpb=0a8f98072c53d877cbb53dd490ba4394d03fa8d2;p=lilypond.git diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index fcc99f05ba..31959d48d5 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -9,7 +9,7 @@ #include "part-combine-music.hh" #include "part-combine-music-iterator.hh" #include "translator-group.hh" -#include "musical-request.hh" +#include "request.hh" #include "music-sequence.hh" #include "lily-guile.hh" #include "warn.hh" @@ -159,7 +159,7 @@ get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations) { SCM d = m->get_mus_property ("duration"); if (d == SCM_EOL) - m->origin ()->warning ("Rhythmic_req has no duration\n"); + m->origin ()->warning ("Music has no duration\n"); else *durations = gh_cons (d, *durations); }