* lily/include/music.hh (class Music): include SCM init argument.

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

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 4c7707ede5da612525149f85ab271ce7745a2a0e..523fef4464d9ee1377748579c90dcaa94e4e4fd9 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -1,15 +1,14 @@
 /*
-  music-list.hh -- declare Music_sequence,
-  Simultaneous_music and Sequential_music
+  music-list.hh -- declare Simultaneous_music, Sequential_music, Event_chord
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef Music_sequence_HH
-#define Music_sequence_HH
+#ifndef MUSIC_LIST_HH
+#define MUSIC_LIST_HH
 
 #include "music-sequence.hh"
 
@@ -19,11 +18,12 @@
 class Simultaneous_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  Simultaneous_music (SCM);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Simultaneous_music);
+
   virtual Pitch to_relative_octave (Pitch);
   virtual Moment get_length () const;
   virtual Moment start_mom () const;
-  Simultaneous_music ();
 };
 
 /*
@@ -32,8 +32,9 @@ public:
 class Event_chord : public Simultaneous_music
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Event_chord);
   virtual Pitch to_relative_octave (Pitch);
+  Event_chord (SCM);
 };
 
 /**
@@ -42,11 +43,11 @@ public:
 class Sequential_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Sequential_music);
   virtual Moment get_length () const;
   virtual Moment start_mom () const;
   
-  Sequential_music ();
+  Sequential_music (SCM);
 };
 
-#endif // Music_sequence_HH
+#endif /* MUSIC_LIST_HH */