* lily/page.cc (Page): Do not use ly_scheme_function for

[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 78b18b0cb2e69a0b1c1db989fda7143e546368e9..566dc9a93f735b75eeb836eb27a9ee89badd55ed 100644 (file)
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,28 +3,24 @@
   
   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>
   
  */
 
 #ifndef LYRIC_COMBINE_MUSIC_HH
 #define LYRIC_COMBINE_MUSIC_HH
-#include "music.hh"
 
+#include "music.hh"
 
 class Lyric_combine_music : public Music
 {
 public:
-  Music * music_l () const;
-  Music * lyrics_l () const;
-  
-  Lyric_combine_music (SCM);
-  virtual void transpose (Pitch);
+  Lyric_combine_music ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Lyric_combine_music);
 
-  VIRTUAL_COPY_CONS(Music);
-  virtual Moment length_mom () const;
-  virtual Pitch to_relative_octave (Pitch);
-  virtual void compress (Moment);
+  Music *get_music () const;
+  Music *get_lyrics () const;
+  virtual Moment get_length () const;
 };
-#endif /* LYRIC_COMBINE_MUSIC_HH */
 
+#endif /* LYRIC_COMBINE_MUSIC_HH */