* Another grand 2003 update.

[lilypond.git] / lily / include / music-list.hh

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 6abf926c4da30080348a8e10d9a12373fec09590..1d74ba0438dc40230efe45075da409116419c3e0 100644 (file)
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,22 +19,24 @@
 class Simultaneous_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS(Music);
-  Simultaneous_music(SCM);
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual Moment length_mom () const;
+  VIRTUAL_COPY_CONS (Music);
+  virtual Pitch to_relative_octave (Pitch);
+  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 mudela is 
-  one Request_chord, one syllable of lyrics is one Request_chord
+  The event is a collection of Events. A note that you enter in lilypond is 
+  one Event_chord, one syllable of lyrics is one Event_chord
  */
-class Request_chord : public Simultaneous_music
+class Event_chord : public Simultaneous_music
 {
 public:
-  VIRTUAL_COPY_CONS(Music);
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  Request_chord(SCM list);
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment start_mom () const;
+
+  Event_chord ();
 };
 
 /**
@@ -43,9 +45,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