*** 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 a64f42c69416d542a301d78669d2afa691988439..b2489c0e1d4f4c66a71b464d113edf5d652e9427 100644 (file)
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -9,19 +9,18 @@
 
 #ifndef LYRIC_COMBINE_MUSIC_HH
 #define LYRIC_COMBINE_MUSIC_HH
-#include "music.hh"
 
+#include "music.hh"
 
 class Lyric_combine_music : public Music
 {
 public:
-  Music * get_music () const;
-  Music * get_lyrics () const;
-  
-  Lyric_combine_music ();
+  Lyric_combine_music (SCM);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Lyric_combine_music);
+  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
 
-  VIRTUAL_COPY_CONS (Music);
-  virtual Moment get_length () const;
+  Music *get_music () const;
+  Music *get_lyrics () const;
 };
-#endif /* LYRIC_COMBINE_MUSIC_HH */
 
+#endif /* LYRIC_COMBINE_MUSIC_HH */