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

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 98b2ce82ed..c77cccd70f 100644
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -1,55 +1,16 @@
 /*
-  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--2000 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.hh"
-#include "cons.hh"
-
-
-class Music_list : public Cons_list<Music> , public Input
-{
-public:
-  Musical_pitch do_relative_octave (Musical_pitch, bool); 
-  void add_music (Music*);
-  Music_list (Music_list const&);
-  Music_list ();
-};
-
-
-/**
-  Music can be a list of other "Music" elements
- */
-class Music_sequence : public Music
-{
-public:
-  Music_list * music_p_list_p_;
-
-  Music_sequence (Music_sequence const&);
-  Music_sequence (Music_list *l_p);
-  
-  VIRTUAL_COPY_CONS(Music);
-  Musical_pitch do_relative_octave (Musical_pitch p, bool b);
-  virtual void transpose (Musical_pitch );
-  virtual void compress (Moment);
-  void add_music (Music *music_p);
-  int length_i () const;
-  Moment cumulative_length () const;
-  Moment maximum_length () const;
-  virtual ~Music_sequence ();
-  
-protected:
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual void do_print() const;
-};
+#include "music-sequence.hh"
 
 /**
   Simultaneous_music is a list of music-elements which happen simultaneously
@@ -57,38 +18,35 @@ protected:
 class Simultaneous_music : public Music_sequence
 {
 public:
-  
-  VIRTUAL_COPY_CONS(Music);
-  
-  Simultaneous_music(Music_list *);
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual Moment length_mom () const;
-};
+  Simultaneous_music ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Simultaneous_music);
 
+  virtual Pitch to_relative_octave (Pitch);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+};
 
-/**
-  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
+/*
+  A 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();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Event_chord);
+  virtual Pitch to_relative_octave (Pitch);
 };
 
-
 /**
   Sequential_music is a list of music-elements which are placed behind each other.
  */
 class Sequential_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS(Music);
-
-  Sequential_music(Music_list*);
-  virtual Moment length_mom () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Sequential_music);
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
+  
+  Sequential_music ();
 };
-#endif // Music_sequence_HH
+
+#endif /* MUSIC_LIST_HH */