2003 -> 2004

[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 a4a47c2a43941b4b9255c85002b0c0ad7578c5ea..a64f42c69416d542a301d78669d2afa691988439 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,16 +15,13 @@
 class Lyric_combine_music : public Music
 {
 public:
-  Music * music_l () const;
-  Music * lyrics_l () const;
+  Music * get_music () const;
+  Music * get_lyrics () const;
   
-  Lyric_combine_music (Music*, Music*);
-  virtual void transpose (Musical_pitch);
-  virtual void do_print () const;
-  VIRTUAL_COPY_CONS(Music);
-  virtual Moment length_mom () const;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-  virtual void compress (Moment);
+  Lyric_combine_music ();
+
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment get_length () const;
 };
 #endif /* LYRIC_COMBINE_MUSIC_HH */