release commit

[lilypond.git] / lily / lyric-combine-music.cc

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 8e36faa6747190296c2ac9da5ed56b639fd40e76..cb77d13c1eafc71ae6f9f694c9c78025dff3a66e 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -8,14 +8,11 @@
  */
 
 #include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (SCM l)
-  : Music (l)
+Lyric_combine_music::Lyric_combine_music ()
+  : Music ()
 {
-  set_mus_property ("iterator-ctor",
-                   Lyric_combine_music_iterator::constructor_proc);
 }
 
 
@@ -28,9 +25,9 @@ Lyric_combine_music::transpose (Pitch p)
 
 
 Moment
-Lyric_combine_music::length_mom () const
+Lyric_combine_music::get_length () const
 {
-  return get_music ()->length_mom ();
+  return get_music ()->get_length ();
 }
 
 Pitch
@@ -70,9 +67,5 @@ Lyric_combine_music::get_lyrics () const
   return unsmob_music (gh_car (l));
 }
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music (SCM_EOL)
-{
-}
 
 ADD_MUSIC (Lyric_combine_music);