* 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 8b26d3ee18f815c1f64f6984055d251b006319a6..1d74ba0438dc40230efe45075da409116419c3e0 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -1,87 +1,55 @@
 /*
-  music-list.hh -- declare Music_list, Chord and Voice
+  music-list.hh -- declare Music_sequence,
+  Simultaneous_music and Sequential_music
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef MUSIC_LIST_HH
-#define MUSIC_LIST_HH
-
-#include "music.hh"
-#include "plist.hh"
+#ifndef Music_sequence_HH
+#define Music_sequence_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_;
-  
-    Music_list(Music_list const&);    
-    Music_list();
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    VIRTUAL_COPY_CONS(Music_list,Music);
-    virtual void add(Music*);
-    virtual void transpose(Melodic_req const *);
-    
-    Pointer_list<Music*> music_p_list_;
-protected:
- 
-    virtual void do_print() const;
+  VIRTUAL_COPY_CONS (Music);
+  virtual Pitch to_relative_octave (Pitch);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  Simultaneous_music ();
 };
 
 /**
-  Chord is a list of music-elements which happen simultaneously
+  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 Chord : public Music_list {
+class Event_chord : public Simultaneous_music
+{
 public:
-    Chord();
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    VIRTUAL_COPY_CONS(Chord,Music);
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
-};
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment start_mom () const;
 
-class Request_chord : public Chord {
-public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Request_chord();
-    VIRTUAL_COPY_CONS(Request_chord,Music);
+  Event_chord ();
 };
 
 /**
-  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_;
-
-    Voice();
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    VIRTUAL_COPY_CONS(Voice, Music);
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  
+  Sequential_music ();
 };
 
-/** A simple piece of music, which wishes to change the spot of its
-  interpretor  */
-class Change_reg : public Music {
-public:
-    
-    /// what kind of iterator needed to walk this music?
-    String type_str_;
-
-    /// what name (or look for this name)
-    String id_str_;
-
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    VIRTUAL_COPY_CONS(Change_reg, Music);
-};
-#endif // MUSIC_LIST_HH
+#endif // Music_sequence_HH