X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-list.hh;h=c77cccd70f25f77237b5f9a6e86015d2de80d4a1;hb=5d057e2673b75417a187d75f09023f6071a81e3e;hp=78a2ac1a6b5fc6b6fc9eec27dc186389198f7668;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 78a2ac1a6b..c77cccd70f 100644
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -1,83 +1,52 @@
 /*
-  music-list.hh -- declare Music_list, Chord and Voice
+  music-list.hh -- declare Simultaneous_music, Sequential_music, Event_chord
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef MUSIC_LIST_HH
 #define MUSIC_LIST_HH
 
-#include "music.hh"
-#include "plist.hh"
-
+#include "music-sequence.hh"
 
 /**
-  Music can be a list of other "Music" elements
+  Simultaneous_music is a list of music-elements which happen simultaneously
  */
-class Music_list : public Music
+class Simultaneous_music : public Music_sequence
 {
-    
 public:
-  int multi_level_i_;
+  Simultaneous_music ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Simultaneous_music);
 
-  Musical_pitch do_relative_octave (Musical_pitch, bool); 
-  Music_list (Music_list const&);
-  Music_list();
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  VIRTUAL_COPY_CONS(Music_list,Music);
-  virtual void add (Music*);
-  virtual void transpose (Musical_pitch );
-    
-  Pointer_list<Music*> music_p_list_;
-protected:
- 
-  virtual void do_print() const;
+  virtual Pitch to_relative_octave (Pitch);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
 };
 
-/**
-  Chord is a list of music-elements which happen simultaneously
+/*
+  A chord.
  */
-
-class Chord : public Music_list
+class Event_chord : public Simultaneous_music
 {
 public:
-  Chord();
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  VIRTUAL_COPY_CONS(Chord,Music);
-  
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual void translate (Moment dt);
-  virtual MInterval time_int() const;
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Event_chord);
+  virtual Pitch to_relative_octave (Pitch);
 };
 
 /**
-  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
- */
-class Request_chord : public Chord
-{
-public:
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  Request_chord();
-  VIRTUAL_COPY_CONS(Request_chord, Music);
-};
-/**
-  Voice is a list of music-elements which are placed behind each other.
+  Sequential_music is a list of music-elements which are placed behind each other.
  */
-class Voice : public Music_list
+class Sequential_music : public Music_sequence
 {
-    
 public:
-  Moment offset_mom_;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  Voice();
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  VIRTUAL_COPY_CONS(Voice, Music);
-  virtual void translate (Moment dt);
-  virtual MInterval time_int() const;
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Sequential_music);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  
+  Sequential_music ();
 };
-#endif // MUSIC_LIST_HH
+
+#endif /* MUSIC_LIST_HH */