patch::: 1.3.44.jcn1

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

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index e00d9633ecb3afebb2a4e69a274deab239833912..98b2ce82edb23d905e56ba1cf4d89360a7a3844e 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,11 +15,10 @@
 #include "cons.hh"
 
 
-class Music_list : public Cons_list<Music> 
+class Music_list : public Cons_list<Music> , public Input
 {
 public:
   Musical_pitch do_relative_octave (Musical_pitch, bool); 
-  Music_iterator* do_rhythm (Music_iterator*); 
   void add_music (Music*);
   Music_list (Music_list const&);
   Music_list ();
@@ -39,7 +38,6 @@ public:
   
   VIRTUAL_COPY_CONS(Music);
   Musical_pitch do_relative_octave (Musical_pitch p, bool b);
-  Music_iterator* do_rhythm (Music_iterator*);
   virtual void transpose (Musical_pitch );
   virtual void compress (Moment);
   void add_music (Music *music_p);
@@ -50,7 +48,6 @@ public:
   
 protected:
   virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual Music_iterator* to_rhythm (Music_iterator*);
   virtual void do_print() const;
 };
 
@@ -65,7 +62,6 @@ public:
   
   Simultaneous_music(Music_list *);
   virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual Music_iterator* to_rhythm (Music_iterator*);
   virtual Moment length_mom () const;
 };
 
@@ -80,7 +76,6 @@ public:
   VIRTUAL_COPY_CONS(Music);
   
   virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual Music_iterator* to_rhythm (Music_iterator*);
   Request_chord();
 };