release: 1.5.25

[lilypond.git] / lily / include / lyric-combine-music.hh

diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
index 16a60a60c00cfc5d422532384c499b557f9ccb84..e9711a1d3cffebc64236f3e4b0e8338f62f7ebbe 100644 (file)
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,22 +14,17 @@
 
 class Lyric_combine_music : public Music
 {
-  Music * music_p_;
-  Music * lyrics_p_;
 public:
   Music * music_l () const;
   Music * lyrics_l () const;
   
-  Lyric_combine_music (Music*, Music*);
+  Lyric_combine_music ();
+  Lyric_combine_music (SCM);
+  virtual void transpose (Pitch);
 
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
-  
-  VIRTUAL_COPY_CONS(Music);
-  Lyric_combine_music (Lyric_combine_music const&);
+  VIRTUAL_COPY_CONS (Music);
   virtual Moment length_mom () const;
-  virtual ~Lyric_combine_music ();
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  virtual Pitch to_relative_octave (Pitch);
   virtual void compress (Moment);
 };
 #endif /* LYRIC_COMBINE_MUSIC_HH */