X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-list.hh;h=e9fc937584a8812e35f2b57210f36a8ff1d9350c;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=1212195f9cf6310dd334c257d2afda6011382ba9;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index 1212195f9c..e9fc937584 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ @@ -19,22 +19,21 @@ class Simultaneous_music : public Music_sequence { public: - VIRTUAL_COPY_CONS(Music); - Simultaneous_music(SCM); + VIRTUAL_COPY_CONS (Music); virtual Pitch to_relative_octave (Pitch); - virtual Moment length_mom () const; + virtual Moment get_length () const; + virtual Moment start_mom () const; + Simultaneous_music (); }; -/** - The request is a collection of Requests. A note that you enter in lilypond is - one Request_chord, one syllable of lyrics is one Request_chord +/* + A chord. */ -class Request_chord : public Simultaneous_music +class Event_chord : public Simultaneous_music { public: - VIRTUAL_COPY_CONS(Music); + VIRTUAL_COPY_CONS (Music); virtual Pitch to_relative_octave (Pitch); - Request_chord(SCM list); }; /** @@ -43,9 +42,11 @@ public: class Sequential_music : public Music_sequence { public: - VIRTUAL_COPY_CONS(Music); - Sequential_music(SCM); - virtual Moment length_mom () const; + VIRTUAL_COPY_CONS (Music); + virtual Moment get_length () const; + virtual Moment start_mom () const; + + Sequential_music (); }; #endif // Music_sequence_HH