*** empty log message ***

[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 e9711a1d3cffebc64236f3e4b0e8338f62f7ebbe..b2489c0e1d4f4c66a71b464d113edf5d652e9427 100644 (file)
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,29 +3,24 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 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 ();
   Lyric_combine_music (SCM);
-  virtual void transpose (Pitch);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Lyric_combine_music);
+  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
 
-  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;
 };
-#endif /* LYRIC_COMBINE_MUSIC_HH */
 
+#endif /* LYRIC_COMBINE_MUSIC_HH */